pages.json

@@ -90,6 +90,12 @@
 				"navigationBarTitleText": "邀请员工"
 			}
 		},
+		{
+			"path": "pages/coupons/coupons",
+			"style": {
+				"navigationBarTitleText": "优惠券"
+			}
+		},
 		{
 			"path": "pages/web/web",
 			"style": {

pages/coupons/coupons.css

@@ -0,0 +1,23 @@
+ax-body{
+	display: block;
+	height: 100%;
+	background: #F5F7FB;
+}
+ax-body >>> .ax-custom-title{
+	background-color: #fff !important;
+}
+.tabs-box{
+	position: fixed;
+	width: 100%;
+	left: 0;
+	height: 100rpx;
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	text-align: center;
+}
+	
+.item-tabs{
+	flex: 1;
+	height: ;
+}

pages/coupons/coupons.vue

@@ -0,0 +1,19 @@
+<template>
+	<ax-body title="">
+		<view class="tabs-body">
+			<view class="tabs-box">
+				<view class="item-tabs">待领取(1)</view>
+				<view class="item-tabs">待使用(2)</view>
+				<view class="item-tabs">已使用(3)</view>
+				<view class="item-tabs">已过期(4)</view>
+			</view>
+		</view>
+	</ax-body>
+</template>
+
+<script>
+</script>
+
+<style>
+	@import url("coupons");
+</style>

pages/index/index.vue

@@ -101,7 +101,7 @@
 									</view>
 									<view class="price">
 										<!-- v-if="user_info.firmId===null" -->
-										<view class="app-flex middle" style="color: #FF5D50;" v-if="user_info||user_info.firmId===null">
+										<view class="app-flex middle" style="color: #FF5D50;" v-if="user_info===null||user_info.firmId===null">
 											<text class="value">{{item.params.nowPrice?item.params.nowPrice.toFixed(4):"0.0000"}}</text>
 											<text class="unit">元/度</text>
 										</view>

pages/my/my.css

@@ -31,6 +31,7 @@ app-navigation{
 /* 用户卡 */
 .user-card{
 	padding: 20px 0;
+	position: relative;
 }
 .user-avatar{
 	display: block;
@@ -51,8 +52,10 @@ app-navigation{
 	margin-top: 5px;
 }
 .seting-icon{
-	width: 24px;
-	height: 24px;
+	position: absolute;
+	right: 0;
+	width:100rpx;
+	height: 100rpx;
 }
 .get-phone-number{
 	display: inline-flex;
@@ -206,6 +209,7 @@ app-navigation{
 	color: #fff;
 }
 .enterprise-tips{
+	text-align: center;
 	font-size: 28rpx;
 	color: #ff0004;
 }

pages/my/my.vue

@@ -21,7 +21,7 @@
 							class="get-phone-number">授权并登录</button>
 					</view>
 				</view>
-				<!-- <image src="@/static/img/seting.svg" class="seting-icon"></image> -->
+				<!-- <image src="@/static/img/Coupons.png" class="seting-icon" @click="$app.url.goto('/pages/coupons/coupons')"></image> -->
 			</view>
 			<!-- 统计卡 -->
 			<view class="app-flex c-between">
@@ -88,7 +88,7 @@
 				<image class="playbil-bg" :src="playbil_img" mode="widthFix"></image>
 				<image class="playbil-qrcode" :src="qrCode" mode=""></image>
 				<view class="enterprise-name">
-					中数未来控股（深圳）有限责任公司
+					{{userinfo.firmInfoName}}
 				</view>
 				<view class="enterprise-user">{{userinfo.nickName?userinfo.nickName:'匿名用户'}}</view>
 				<view class="enterprise-tips">*点击图片进行分享或保存</view>

pages/terminal/terminal.vue

@@ -80,6 +80,14 @@
 									元/度</text></view>
 						</view>
 					</view>
+					<view class="cell" v-if="nowPriceTime.firmPrice">
+						<view class="lable">企业专享价</view>
+						<view class="contet app-flex middle">
+							<view><text
+									class="money">{{nowPriceTime.firmPrice?parseFloat(nowPriceTime.firmPrice).toFixed(4):"0.0000"}}</text><text>
+									元/度</text></view>
+						</view>
+					</view>
 					<view class="cell">
 						<view class="lable">当前时段</view>
 						<view class="contet">{{getPriceLable(nowPriceTime.timeType)}} {{nowPriceTime.time}}</view>

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/dev/mp-weixin/app.json

@@ -15,6 +15,7 @@
     "pages/order/order",
     "pages/search/search",
     "pages/Invite-staff/Invite-staff",
+    "pages/coupons/coupons",
     "pages/web/web",
     "pages/feedback-reply/feedback-reply"
   ],

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/',
   // 下载地址
@@ -10987,6 +10987,11 @@ var _default = {
     "style": {
       "navigationBarTitleText": "邀请员工"
     }
+  }, {
+    "path": "pages/coupons/coupons",
+    "style": {
+      "navigationBarTitleText": "优惠券"
+    }
   }, {
     "path": "pages/web/web",
     "style": {

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 */ 186))
+      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))
     },
     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/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 */ 186))
+      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))
     },
     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 */ 207))
+      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))
     },
   }
 } 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 */ 186))
+      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))
     },
     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 */ 207))
+      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))
     },
   }
 } catch (e) {

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

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "优惠券",
+  "usingComponents": {
+    "ax-body": "/components/ax-body/ax-body"
+  }
+}

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

@@ -0,0 +1 @@
+<ax-body vue-id="6375c024-1" title bind:__l="__l" vue-slots="{{['default']}}"><view class="tabs-body"><view class="tabs-box"><view class="item-tabs">待领取(1)</view><view class="item-tabs">待使用(2)</view><view class="item-tabs">已使用(3)</view><view class="item-tabs">已过期(4)</view></view></view></ax-body>

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

@@ -0,0 +1,23 @@
+ax-body{
+	display: block;
+	height: 100%;
+	background: #F5F7FB;
+}
+ax-body .ax-custom-title{
+	background-color: #fff !important;
+}
+.tabs-box{
+	position: fixed;
+	width: 100%;
+	left: 0;
+	height: 100rpx;
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	text-align: center;
+}
+.item-tabs{
+	flex: 1;
+	height: ;
+}
+

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 */ 186))
+      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))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.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 */ 186))
+      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))
     },
     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 */ 193))
+      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 */ 201))
     },
   }
 } catch (e) {
@@ -144,14 +144,16 @@ var render = function () {
   var l1 = _vm.__map(_vm.list.data, function (item, index) {
     var $orig = _vm.__get_orig(item)
     var g1 =
-      (_vm.user_info || _vm.user_info.firmId === null) && item.params.nowPrice
+      (_vm.user_info === null || _vm.user_info.firmId === null) &&
+      item.params.nowPrice
         ? item.params.nowPrice.toFixed(4)
         : null
-    var g2 = !(_vm.user_info || _vm.user_info.firmId === null)
+    var g2 = !(_vm.user_info === null || _vm.user_info.firmId === null)
       ? item.params.firmPrice.toFixed(4)
       : null
     var g3 =
-      !(_vm.user_info || _vm.user_info.firmId === null) && item.params.nowPrice
+      !(_vm.user_info === null || _vm.user_info.firmId === null) &&
+      item.params.nowPrice
         ? item.params.nowPrice.toFixed(4)
         : null
     return {

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 */ 186))
+      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))
     },
   }
 } 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 */ 186))
+      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))
     },
     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 */ 200))
+      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 */ 208))
     },
     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 */ 193))
+      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 */ 201))
     },
   }
 } 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 */ 186))
+      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))
     },
     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 */ 200))
+      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 */ 208))
     },
     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 */ 193))
+      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 */ 201))
     },
   }
 } catch (e) {

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

@@ -41,6 +41,7 @@ app-navigation.data-v-0be17cc6{
 /* 用户卡 */
 .user-card.data-v-0be17cc6{
 	padding: 20px 0;
+	position: relative;
 }
 .user-avatar.data-v-0be17cc6{
 	display: block;
@@ -61,8 +62,10 @@ app-navigation.data-v-0be17cc6{
 	margin-top: 5px;
 }
 .seting-icon.data-v-0be17cc6{
-	width: 24px;
-	height: 24px;
+	position: absolute;
+	right: 0;
+	width:100rpx;
+	height: 100rpx;
 }
 .get-phone-number.data-v-0be17cc6{
 	display: inline-flex;
@@ -215,6 +218,7 @@ app-navigation.data-v-0be17cc6{
 	color: #fff;
 }
 .enterprise-tips.data-v-0be17cc6{
+	text-align: center;
 	font-size: 28rpx;
 	color: #ff0004;
 }

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 */ 186))
+      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))
     },
   }
 } 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 */ 186))
+      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))
     },
     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 */ 200))
+      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 */ 208))
     },
   }
 } 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 */ 186))
+      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))
     },
   }
 } 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 */ 186))
+      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))
     },
   }
 } 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 */ 186))
+      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))
     },
     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 */ 207))
+      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))
     },
   }
 } 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 */ 186))
+      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))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/terminal/terminal.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 */ 186))
+      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))
     },
     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 */ 207))
+      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))
     },
   }
 } catch (e) {
@@ -142,6 +142,10 @@ var render = function () {
     _vm.discountInfo && _vm.personal == 1 && _vm.discountInfo.discount
       ? parseFloat(_vm.discountInfo.discount).toFixed(4)
       : null
+  var g3 =
+    _vm.nowPriceTime.firmPrice && _vm.nowPriceTime.firmPrice
+      ? parseFloat(_vm.nowPriceTime.firmPrice).toFixed(4)
+      : null
   var m2 = _vm.getPriceLable(_vm.nowPriceTime.timeType)
   var m3 = _vm.getDeviceStatusLable(_vm.deviceInfo.deviceStatus)
   if (!_vm._isMounted) {
@@ -160,6 +164,7 @@ var render = function () {
         g1: g1,
         m1: m1,
         g2: g2,
+        g3: g3,
         m2: m2,
         m3: m3,
       },
@@ -334,6 +339,14 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   onLoad: function onLoad(opts) {
     console.log("参数信息：", opts);

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/web/web"],{
 
-/***/ 172:
+/***/ 180:
 /*!***************************************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/main.js?{"page":"pages%2Fweb%2Fweb"} ***!
   \***************************************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _web = _interopRequireDefault(__webpack_require__(/*! ./pages/web/web.vue */ 173));
+var _web = _interopRequireDefault(__webpack_require__(/*! ./pages/web/web.vue */ 181));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_web.default);
@@ -21,7 +21,7 @@ createPage(_web.default);
 
 /***/ }),
 
-/***/ 173:
+/***/ 181:
 /*!********************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue ***!
   \********************************************************************/
@@ -30,8 +30,8 @@ createPage(_web.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./web.vue?vue&type=template&id=aed5e5a0& */ 174);
-/* harmony import */ var _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./web.vue?vue&type=script&lang=js& */ 176);
+/* harmony import */ var _web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./web.vue?vue&type=template&id=aed5e5a0& */ 182);
+/* harmony import */ var _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./web.vue?vue&type=script&lang=js& */ 184);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -60,7 +60,7 @@ component.options.__file = "pages/web/web.vue"
 
 /***/ }),
 
-/***/ 174:
+/***/ 182:
 /*!***************************************************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=template&id=aed5e5a0& ***!
   \***************************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pages/web/web.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=template&id=aed5e5a0& */ 175);
+/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=template&id=aed5e5a0& */ 183);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 175:
+/***/ 183:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=template&id=aed5e5a0& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 176:
+/***/ 184:
 /*!*********************************************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************/
@@ -127,14 +127,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=script&lang=js& */ 177);
+/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=script&lang=js& */ 185);
 /* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 177:
+/***/ 185:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -182,5 +182,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[172,"common/runtime","common/vendor"]]]);
+},[[180,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/web/web.js.map

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/',
 	// 下载地址