对账/补缴；轮播跳转页面

pages.json

@@ -110,6 +110,12 @@
 			"style": {
 				"navigationBarTitleText": "反馈答复"
 			}
+		},
+		{
+			"path": "pages/banner-page/banner-page",
+			"style": {
+				"navigationBarTitleText": "活动详情"
+			}
 		}
 	],
 	"globalStyle": {

pages/banner-page/banner-page.css

@@ -0,0 +1,25 @@
+ax-body{
+	display: block;
+	height: 100%;
+	background:linear-gradient(to bottom, rgba(82, 180, 251,0.9),rgba(82, 180, 251,1));
+}
+.page-background{
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 0;
+}
+.page-background image{
+	display: block;
+	width: 100%;
+}
+.image-box{
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+.image-bg{
+	position: absolute;
+	width: 100%;
+}

pages/banner-page/banner-page.vue

@@ -0,0 +1,22 @@
+<template>
+	<ax-body blank="0" hideIndicatorArea>
+		<view class="page-background"><image src="@/static/img/my-bg.svg" mode="widthFix"></image></view>
+		<view class="image-box">
+			<image class="image-bg" :src="image_bg" mode="widthFix"></image>
+		</view>
+	</ax-body>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				image_bg:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg'
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import url('banner-page');
+</style>

pages/coupon-buy/coupon-buy.vue

@@ -15,7 +15,7 @@
 					<view class="value">{{userinfo.params.balance}}</view>
 					<view class="name">可抵扣余量</view>
 					<image src="@/static/img/my-sta-bg03.png" mode="heightFix" class="bg"></image>
-					<view class="overflow-payment" @click="topage_order">
+					<view class="overflow-payment" v-if="order_info!=null" @click="topage_order">
 						<text v-if="order_info.maspStatus===1">超{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)||'0.00'}}元</text>
 						<text class="ax ax-iconline i-arrow-right icon"></text>
 					</view>
@@ -25,7 +25,9 @@
 			<view class="card">
 				<view class="title">
 					<view>请选择抵扣券</view>
-					<view class="title-text" v-if="order_info.maspStatus===1">至少充值{{(3+((order_info.maspAmount+order_info.maspRealAmount))).toFixed(2)||'0.00'}}元(超充{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)||'0.00'}}元，余量需大于3元才能启动)</view>
+					<template v-if="order_info!=null">
+						<view class="title-text" v-if="order_info.maspStatus===1">至少充值{{(3+((order_info.maspAmount+order_info.maspRealAmount))).toFixed(2)||'0.00'}}元(超充{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)||'0.00'}}元，余量需大于3元才能启动)</view>
+					</template>
 				</view>
 				<view class="coupons">
 					<view v-for="(item,index) in coupons.data" :key="index" :style="{opacity:`${(3+(order_info.maspAmount+order_info.maspRealAmount)).toFixed(2)>item.levelMoney?'0.4':''}`}" :class="{active:coupons.index==index}"
@@ -56,7 +58,9 @@
 				<view class="li">5. 实际结算价以具体充电时段为准</view>
 			</view>
 			<view class="footer">
-				<view class="payment-tips" v-if="coupons.index>=0">购买{{select_num}}元，补缴{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)}}元，剩余{{select_num-(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)}}元</view>
+				<template v-if="order_info!=null">
+					<view class="payment-tips" v-if="coupons.index>=0">购买{{select_num}}元，补缴{{(order_info.maspAmount+order_info.maspRealAmount).toFixed(2)}}元，剩余{{(select_num-(order_info.maspAmount+order_info.maspRealAmount)).toFixed(2)}}元</view>
+				</template>
 				<button @click="pay()" class="pay" :disabled="coupons.index<0">立即支付购买</button>
 				<ax-ios-indicator></ax-ios-indicator>
 			</view>
@@ -72,7 +76,7 @@ import app from '../../static/js/app'
 				userinfo: {},
 				select_num:null,
 				payment:null,
-				order_info:{},
+				order_info:null,
 				order_status:[],
 				coupons: {
 					index: -1,
@@ -96,10 +100,12 @@ import app from '../../static/js/app'
 				})
 			},
 			choose(item, index) {
-				let num=((this.order_info.maspAmount+this.order_info.maspRealAmount)+3).toFixed(2)
-				if(num>item.levelMoney){
-					this.$app.popup.toast(`购买金额必须大于${num}元`)
-					return
+				if(this.order_info!=null){
+					let num=((this.order_info.maspAmount+this.order_info.maspRealAmount)+3).toFixed(2)
+					if(num>item.levelMoney){
+						this.$app.popup.toast(`购买金额必须大于${num}元`)
+						return
+					}
 				}
 				this.coupons.index = this.coupons.index != index ? index : -1;
 				this.select_num=item.levelMoney

static/js/config.js

@@ -7,9 +7,9 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	// request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://192.168.1.34:80/',
+	request : 'http://192.168.1.36:80/',
 	// request : 'http://120.78.228.211:8866/',
-	request : 'https://charge.dev.hub.zswlgz.com/',
+	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',
 	// 下载地址

unpackage/dist/build/mp-weixin/app.json

@@ -17,7 +17,8 @@
     "pages/Invite-staff/Invite-staff",
     "pages/coupons/coupons",
     "pages/web/web",
-    "pages/feedback-reply/feedback-reply"
+    "pages/feedback-reply/feedback-reply",
+    "pages/banner-page/banner-page"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/banner-page/banner-page"],{"03eb":function(n,e,t){},"2f4e":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{image_bg:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg"}}}},"857c":function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return a}));var a={axBody:function(){return t.e("components/ax-body/ax-body").then(t.bind(null,"8839"))}},c=function(){var n=this.$createElement;this._self._c},u=[]},a19a:function(n,e,t){"use strict";t.r(e);var a=t("2f4e"),c=t.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);e["default"]=c.a},c21f:function(n,e,t){"use strict";(function(n,e){var a=t("47a9");t("2acb");a(t("3240"));var c=a(t("f06d"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},c476:function(n,e,t){"use strict";var a=t("03eb"),c=t.n(a);c.a},f06d:function(n,e,t){"use strict";t.r(e);var a=t("857c"),c=t("a19a");for(var u in c)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(u);t("c476");var r=t("828b"),f=Object(r["a"])(c["default"],a["b"],a["c"],!1,null,"6d8a00a9",null,!1,a["a"],void 0);e["default"]=f.exports}},[["c21f","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "活动详情",
+  "usingComponents": {
+    "ax-body": "/components/ax-body/ax-body"
+  }
+}

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.wxml

@@ -0,0 +1 @@
+<ax-body vue-id="ca9af144-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-6d8a00a9" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background data-v-6d8a00a9"><image src="/static/img/my-bg.svg" mode="widthFix" class="data-v-6d8a00a9"></image></view><view class="image-box data-v-6d8a00a9"><image class="image-bg data-v-6d8a00a9" src="{{image_bg}}" mode="widthFix"></image></view></ax-body>

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.wxss

@@ -0,0 +1 @@
+ax-body.data-v-6d8a00a9{display:block;height:100%;background:linear-gradient(180deg,rgba(82,180,251,.9),#52b4fb)}.page-background.data-v-6d8a00a9{position:fixed;top:0;left:0;right:0;z-index:0}.page-background image.data-v-6d8a00a9{display:block;width:100%}.image-box.data-v-6d8a00a9{position:relative;width:100%;height:100%}.image-bg.data-v-6d8a00a9{position:absolute;width:100%}

unpackage/dist/build/mp-weixin/static/js/config.js

@@ -6,10 +6,10 @@ const config = {};
 // 地址类
 config.url = {
 	// API请求基础URL
-	// request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://192.168.1.34:80/',
+	request : 'https://charge.hub.zswlgz.com/',
+	// request : 'http://192.168.1.36:80/',
 	// request : 'http://120.78.228.211:8866/',
-	request : 'https://charge.dev.hub.zswlgz.com/',
+	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',
 	// 下载地址

unpackage/dist/dev/mp-weixin/app.json

@@ -17,7 +17,8 @@
     "pages/Invite-staff/Invite-staff",
     "pages/coupons/coupons",
     "pages/web/web",
-    "pages/feedback-reply/feedback-reply"
+    "pages/feedback-reply/feedback-reply",
+    "pages/banner-page/banner-page"
   ],
   "subPackages": [],
   "window": {

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

@@ -10842,9 +10842,9 @@ var config = {};
 config.url = {
   // API请求基础URL
   // request : 'https://charge.hub.zswlgz.com/',
-  // request : 'http://192.168.1.34:80/',
+  request: 'http://192.168.1.36:80/',
   // request : 'http://120.78.228.211:8866/',
-  request: 'https://charge.dev.hub.zswlgz.com/',
+  // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: 'http://127.0.0.1:3000/upload/',
   // 下载地址
@@ -11005,6 +11005,11 @@ var _default = {
     "style": {
       "navigationBarTitleText": "反馈答复"
     }
+  }, {
+    "path": "pages/banner-page/banner-page",
+    "style": {
+      "navigationBarTitleText": "活动详情"
+    }
   }],
   "globalStyle": {
     "navigationBarTextStyle": "black",

unpackage/dist/dev/mp-weixin/pages/Invite-staff/Invite-staff.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     rCanvas: function () {
       return Promise.all(/*! import() | components/r-canvas/r-canvas */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/r-canvas/r-canvas")]).then(__webpack_require__.bind(null, /*! @/components/r-canvas/r-canvas.vue */ 66))

unpackage/dist/dev/mp-weixin/pages/banner-page/banner-page.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "活动详情",
+  "usingComponents": {
+    "ax-body": "/components/ax-body/ax-body"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/banner-page/banner-page.wxml

@@ -0,0 +1 @@
+<ax-body vue-id="ca9af144-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-2e47cea8" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background data-v-2e47cea8"><image src="/static/img/my-bg.svg" mode="widthFix" class="data-v-2e47cea8"></image></view><view class="image-box data-v-2e47cea8"><image class="image-bg data-v-2e47cea8" src="{{image_bg}}" mode="widthFix"></image></view></ax-body>

unpackage/dist/dev/mp-weixin/pages/banner-page/banner-page.wxss

@@ -0,0 +1,26 @@
+ax-body.data-v-2e47cea8{
+	display: block;
+	height: 100%;
+	background:linear-gradient(to bottom, rgba(82, 180, 251,0.9),rgba(82, 180, 251,1));
+}
+.page-background.data-v-2e47cea8{
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 0;
+}
+.page-background image.data-v-2e47cea8{
+	display: block;
+	width: 100%;
+}
+.image-box.data-v-2e47cea8{
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+.image-bg.data-v-2e47cea8{
+	position: absolute;
+	width: 100%;
+}
+

unpackage/dist/dev/mp-weixin/pages/charging/charging.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 215))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/coupon-buy/coupon-buy.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 215))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
     },
   }
 } catch (e) {
@@ -129,20 +129,20 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 =
-    _vm.order_info.maspStatus === 1
+    _vm.order_info != null && _vm.order_info.maspStatus === 1
       ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(
           2
         ) || "0.00"
       : null
   var g1 =
-    _vm.order_info.maspStatus === 1
+    _vm.order_info != null && _vm.order_info.maspStatus === 1
       ? (
           3 +
           (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount)
         ).toFixed(2) || "0.00"
       : null
   var g2 =
-    _vm.order_info.maspStatus === 1
+    _vm.order_info != null && _vm.order_info.maspStatus === 1
       ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(
           2
         ) || "0.00"
@@ -152,12 +152,15 @@ var render = function () {
     (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount)
   ).toFixed(2)
   var g4 =
-    _vm.coupons.index >= 0
+    _vm.order_info != null && _vm.coupons.index >= 0
       ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(2)
       : null
   var g5 =
-    _vm.coupons.index >= 0
-      ? (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount).toFixed(2)
+    _vm.order_info != null && _vm.coupons.index >= 0
+      ? (
+          _vm.select_num -
+          (_vm.order_info.maspAmount + _vm.order_info.maspRealAmount)
+        ).toFixed(2)
       : null
   _vm.$mp.data = Object.assign(
     {},
@@ -279,13 +282,17 @@ var _app = _interopRequireDefault(__webpack_require__(/*! ../../static/js/app */
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
       userinfo: {},
       select_num: null,
       payment: null,
-      order_info: {},
+      order_info: null,
       order_status: [],
       coupons: {
         index: -1,
@@ -310,10 +317,12 @@ var _default = {
       });
     },
     choose: function choose(item, index) {
-      var num = (this.order_info.maspAmount + this.order_info.maspRealAmount + 3).toFixed(2);
-      if (num > item.levelMoney) {
-        this.$app.popup.toast("\u8D2D\u4E70\u91D1\u989D\u5FC5\u987B\u5927\u4E8E".concat(num, "\u5143"));
-        return;
+      if (this.order_info != null) {
+        var num = (this.order_info.maspAmount + this.order_info.maspRealAmount + 3).toFixed(2);
+        if (num > item.levelMoney) {
+          this.$app.popup.toast("\u8D2D\u4E70\u91D1\u989D\u5FC5\u987B\u5927\u4E8E".concat(num, "\u5143"));
+          return;
+        }
       }
       this.coupons.index = this.coupons.index != index ? index : -1;
       this.select_num = item.levelMoney;

unpackage/dist/dev/mp-weixin/pages/coupons/coupons.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/feedback-reply/feedback-reply.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/feedback/feedback.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 208))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 214))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/map/map.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 208))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 214))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
     },
     rCanvas: function () {
       return Promise.resolve(/*! import() */).then(__webpack_require__.bind(null, /*! @/components/r-canvas/r-canvas.vue */ 66))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 208))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 214))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/order-detail/order-detail.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/order/order.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/recharge-log/recharge-log.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/search/search.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/site-more/site-more.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 215))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/site/site.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/terminal/terminal.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 215))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,15 +9,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "设备启动页面",
-          "pathName": "pages/charging/charging",
+          "name": "订单详情",
+          "pathName": "pages/banner-page/banner-page",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "订单详情",
-          "pathName": "pages/order-detail/order-detail",
+          "name": "设备启动页面",
+          "pathName": "pages/charging/charging",
           "query": "",
           "launchMode": "default",
           "scene": null

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

@@ -7,9 +7,9 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	// request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://192.168.1.34:80/',
+	request : 'http://192.168.1.36:80/',
 	// request : 'http://120.78.228.211:8866/',
-	request : 'https://charge.dev.hub.zswlgz.com/',
+	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',
 	// 下载地址