Explorar o código

```
feat(home): 更新广告轮播图配置和接口调用

- 调整广告轮播图间隔时间从3秒增加到8秒
- 添加轮播图循环播放和指示器功能
- 修复广告图片显示问题,直接使用原始图片链接
- 激活并优化广告轮播数据获取方法
- 更新轮播图API接口地址和请求方式为GET
- 修复个人中心页面轮播图循环播放功能
- 更新开发环境API配置地址
```

zouzexu hai 1 día
pai
achega
74dc5193fb
Modificáronse 34 ficheiros con 33 adicións e 39 borrados
  1. 9 8
      pages/index/index.vue
  2. 1 1
      pages/my/my.vue
  3. 2 2
      static/js/config.js
  4. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/app-navigation/app-navigation.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-body/ax-body.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-custom-title/ax-custom-title.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-popup/ax-popup.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/banner-page/banner-page.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/charging/charging.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon-buy/coupon-buy.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupons/coupons.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/feedback-reply/feedback-reply.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/feedback/feedback.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/new-site/new-site.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-detail/order-detail.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/recharge-log/recharge-log.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/site-more/site-more.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/site/site.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/terminal/terminal.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js.map
  30. 2 2
      unpackage/dist/dev/mp-weixin/common/vendor.js
  31. 17 24
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  32. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  33. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/my.wxml
  34. 2 2
      unpackage/dist/dev/mp-weixin/static/js/config.js

+ 9 - 8
pages/index/index.vue

@@ -168,9 +168,9 @@
 		<ax-popup ref="filter" position="" maskType="black" maskEnable maskClose>
 			<view class="ad-popup">
 				<view class="close-get" @click="closeAd">X</view>
-				<swiper class="ad-swiper" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper class="ad-swiper" :autoplay="true" :interval="8000" :duration="1000" circular indicator-dots>
 					<swiper-item class="ad-swiper-item" v-for="(item, index) in adBanner" :key="index">
-						<image class="ad-image" :src="showImg(item.picture)" @click="goImgLink(item)" mode="widthFix">
+						<image class="ad-image" :src="item.picture" @click="goImgLink(item)" mode="widthFix">
 						</image>
 					</swiper-item>
 				</swiper>
@@ -316,7 +316,7 @@ export default {
 		}
 	},
 	onShow() {
-		// this.getAdswiper()
+		this.getAdswiper()
 	},
 	onHide() {
 		this.$app.storage.remove('AD_STATUS')
@@ -581,11 +581,12 @@ export default {
 				this.banners = res.data
 			})
 		},
-		// getAdswiper() {
-		// 	this.$api.base("post", "/userApi/getAdvertising", {}, {}).then(res => {
-		// 		this.adBanner = res.banners
-		// 	})
-		// },
+		getAdswiper() {
+			this.$api.base("get", "/applet/v1/homePage/getAdvertisingList", {}, {}).then(res => {
+				this.adBanner = res.data
+				// this.$refs.filter.open()
+			})
+		},
 		convertBdToTx(lng, lat) {
 			// 百度坐标系(BD09)转火星坐标系(GCJ-02,即腾讯地图使用的坐标系)  
 			// 这里的转换公式是基于经验公式,可能存在一定的误差  

+ 1 - 1
pages/my/my.vue

@@ -48,7 +48,7 @@
 				<view @click="$app.url.goto('/pages/coupon-buy/coupon-buy')" class="buy">购买充电券</view>
 			</view>
 			<!-- 个人中心banner -->
-			<swiper class="banner" v-if="banners.length > 0" autoplay="true">
+			<swiper class="banner" v-if="banners.length > 0" autoplay="true" circular>
 				<swiper-item v-for="(item, index) in banners" :key="index" @click="$app.url.goto(item.jumpPage)">
 					<view class="swiper-item">
 						<image @load="bannerLoadCompleted()" :src="item.picture" class="swiper-item-image"

+ 2 - 2
static/js/config.js

@@ -11,8 +11,8 @@ config.url = {
   // request : 'http://192.168.110.3:80/',
   // request : 'http://192.168.1.253:80/',
   // request : 'http://120.78.228.211:8866/',
-  // request: "http://192.168.0.11:8989/",
-  request: "http://192.168.0.217:8989/",
+  request: "http://192.168.0.11:8989/",
+  // request: "http://192.168.0.217:8989/",
   // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: "http://127.0.0.1:3000/upload/",

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/app-navigation/app-navigation.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-body/ax-body.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-custom-title/ax-custom-title.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-popup/ax-popup.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/banner-page/banner-page.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/charging/charging.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon-buy/coupon-buy.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupons/coupons.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/feedback-reply/feedback-reply.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/feedback/feedback.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/new-site/new-site.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-detail/order-detail.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/recharge-log/recharge-log.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/site-more/site-more.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/site/site.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/terminal/terminal.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js.map


+ 2 - 2
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -13912,8 +13912,8 @@ config.url = {
   // request : 'http://192.168.110.3:80/',
   // request : 'http://192.168.1.253:80/',
   // request : 'http://120.78.228.211:8866/',
-  // request: "http://192.168.0.11:8989/",
-  request: "http://192.168.0.217:8989/",
+  request: "http://192.168.0.11:8989/",
+  // request: "http://192.168.0.217:8989/",
   // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: "http://127.0.0.1:3000/upload/",

+ 17 - 24
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -137,14 +137,6 @@ var render = function () {
       ? (_vm.payment_msg.maspAmount + _vm.payment_msg.maspRealAmount).toFixed(2)
       : null
   var g1 = _vm.banners.length
-  var l0 = _vm.__map(_vm.adBanner, function (item, index) {
-    var $orig = _vm.__get_orig(item)
-    var m0 = _vm.showImg(item.picture)
-    return {
-      $orig: $orig,
-      m0: m0,
-    }
-  })
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       return _vm.$app.url.goto("/pages/search/search")
@@ -182,7 +174,6 @@ var render = function () {
         s0: s0,
         g0: g0,
         g1: g1,
-        l0: l0,
       },
     }
   )
@@ -549,7 +540,7 @@ var _default = {
     };
   },
   onShow: function onShow() {
-    // this.getAdswiper()
+    this.getAdswiper();
   },
   onHide: function onHide() {
     this.$app.storage.remove('AD_STATUS');
@@ -785,11 +776,13 @@ var _default = {
         _this9.banners = res.data;
       });
     },
-    // getAdswiper() {
-    // 	this.$api.base("post", "/userApi/getAdvertising", {}, {}).then(res => {
-    // 		this.adBanner = res.banners
-    // 	})
-    // },
+    getAdswiper: function getAdswiper() {
+      var _this10 = this;
+      this.$api.base("get", "/applet/v1/homePage/getAdvertisingList", {}, {}).then(function (res) {
+        _this10.adBanner = res.data;
+        // this.$refs.filter.open()
+      });
+    },
     convertBdToTx: function convertBdToTx(lng, lat) {
       // 百度坐标系(BD09)转火星坐标系(GCJ-02,即腾讯地图使用的坐标系)  
       // 这里的转换公式是基于经验公式,可能存在一定的误差  
@@ -806,7 +799,7 @@ var _default = {
       };
     },
     getStations: function getStations(lng, lat) {
-      var _this10 = this;
+      var _this11 = this;
       this.$api.base("post", "/applet/v1/homePage/getStationInfoPage", {
         pageNum: this.pageNum,
         pageSize: 10,
@@ -815,25 +808,25 @@ var _default = {
         latitude: lat,
         userId: parseInt(this.$app.storage.get('USER_INFO').appletUserId)
       }, {}).then(function (res) {
-        if (_this10.pageNum == 1) {
-          _this10.list.data = res.data.list;
+        if (_this11.pageNum == 1) {
+          _this11.list.data = res.data.list;
         } else {
-          _this10.list.data = _this10.list.data.concat(res.data.list);
+          _this11.list.data = _this11.list.data.concat(res.data.list);
         }
       });
     },
     // 设定导航栏高度
     setAppNavigationHeight: function setAppNavigationHeight() {
-      var _this11 = this;
+      var _this12 = this;
       this.$nextTick(function () {
-        uni.createSelectorQuery().in(_this11).select("#app-navigation").boundingClientRect(function (data) {
-          _this11.appNavigationHeight = data.height;
+        uni.createSelectorQuery().in(_this12).select("#app-navigation").boundingClientRect(function (data) {
+          _this12.appNavigationHeight = data.height;
         }).exec();
       });
     },
     // 设置列表高度
     setListHeight: function setListHeight() {
-      var _this12 = this;
+      var _this13 = this;
       this.$app.act.selectorQuery(this, "#list-box,#roller", true).then(function (res) {
         var win = uni.getWindowInfo();
         var roller = res.find(function (i) {
@@ -842,7 +835,7 @@ var _default = {
         var list = res.find(function (i) {
           return i.id == 'list-box';
         });
-        _this12.list.height = win.windowHeight - list.top - _this12.appNavigationHeight + roller.height;
+        _this13.list.height = win.windowHeight - list.top - _this13.appNavigationHeight + roller.height;
       });
     },
     // 版头加载完成

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/my.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/static/js/config.js

@@ -11,8 +11,8 @@ config.url = {
   // request : 'http://192.168.110.3:80/',
   // request : 'http://192.168.1.253:80/',
   // request : 'http://120.78.228.211:8866/',
-  // request: "http://192.168.0.11:8989/",
-  request: "http://192.168.0.217:8989/",
+  request: "http://192.168.0.11:8989/",
+  // request: "http://192.168.0.217:8989/",
   // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: "http://127.0.0.1:3000/upload/",

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio