新增设备启动页面充电动画loading

pages/charging/charging.css

@@ -88,13 +88,12 @@
 	font-weight: bold;
 	margin-top: 5px;
 }
-
 /* 主图 */
 .host-graph{
 	margin-top: 20px;
 }
 .host-graph .image{
-	width: 60vw;
+	width: 40vw;
 }
 
 /* 主参数 */

pages/charging/charging.vue

@@ -19,6 +19,12 @@
 				<view class="value">{{timer.text}}</view>
 				<view class="name">充电时间</view>
 			</view>
+			<!-- 充电动画 -->
+			<view class="charge-loading-box" v-if="orderInfo.status == 1">
+				<view class="charge-loading">
+					<view class="c-loading"></view>
+				</view>
+			</view>
 			<view v-if="orderInfo.status == 0" class="timer">
 				<view class="value" style="font-size: 22px;">充电正在启动中......</view>	
 				<view v-if="isShowBtn" class="name" style="color: red;font-size: 14px;">长时间无法启动可点击“长按结束充电”按钮结束订单。</view>
@@ -231,6 +237,41 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 @import url("charging.css");
+/* 充电loading动画 */
+	.charge-loading-box {
+		margin: auto;
+		margin-top: 20rpx;
+	}
+
+	.charge-loading {
+		width: 364rpx;
+		height: 36rpx;
+		background: #FFFFFF;
+		border-radius: 18rpx;
+		overflow: hidden;
+	}
+
+	.c-loading {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(66deg,
+				rgba(139, 243, 251, 0),
+				#60C8FE,
+				#53D4FF,
+				 rgba(139, 243, 251, 0.7),);
+		border-radius: 18rpx;
+		animation: loading 3s linear infinite;
+		background-size: 200% 100%;
+	}
+
+	@keyframes loading {
+		0% {
+			background-position: 100% 0;
+		}
+		100% {
+			background-position: -100% 0;
+		}
+	}
 </style>

pages/index/index.css

@@ -424,4 +424,21 @@ app-navigation {
 	font-size: 24rpx;
 	color: #AAAAAA;
 	text-decoration: line-through;
+}
+.ad-popup{
+}
+.close-get{
+	margin-left:550rpx;
+	width:50rpx;
+	height:50rpx;
+	border-radius: 50%;
+	border: 4rpx solid #3EB6F8;
+	color:#fff;
+	font-size: 30rpx;
+	font-weight: bold;
+	text-align: center;
+}
+.ad-image{
+	margin-top: 10rpx;
+	width:600rpx;
 }

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===null||user_info.firmId===null">
+										<view class="app-flex middle" style="color: #FF5D50;" v-if="user_info.firmType===0||user_info.firmId===null||user_info===null">
 											<text class="value">{{item.params.nowPrice?item.params.nowPrice.toFixed(4):"0.0000"}}</text>
 											<text class="unit">元/度</text>
 										</view>
@@ -125,6 +125,12 @@
 				</view>
 			</scroll-view>
 		</view>
+		<ax-popup ref="filter" position="" maskType="black" maskEnable maskClose>
+			<view class="ad-popup">
+				<view class="close-get" @click="$refs.filter.close()">X</view>
+				<image class="ad-image" :src="playbil_img" mode="widthFix"></image>
+			</view>
+		</ax-popup>
 		<app-navigation id="app-navigation" active="home"></app-navigation>
 	</ax-body>
 </template>
@@ -167,6 +173,9 @@
 			// this.user_info=this.$app.storage.get('USER_INFO')
 		},
 		mounted() {
+			if(this.isAd){
+				this.$refs.filter.open();
+			}
 			this.setListHeight();
 			this.setAppNavigationHeight();
 			this.get_frimid()
@@ -174,6 +183,8 @@
 		},
 		data() {
 			return {
+				isAd:false,
+				playbil_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/XVsEVGuCCbNv4aee36cc2f76e7050f62ebad3080ad88.jpg/1.jpg',
 				user_info:{},
 				// 导航栏高度
 				appNavigationHeight: 0,
@@ -255,16 +266,16 @@
 				if(this.$app.storage.get('FRIM_ID')){
 					if(this.$app.storage.get('USER_TOKEN')){
 						this.$api.base("post","/userApi/add-firm-user?firmId="+parseInt(this.$app.storage.get('FRIM_ID')),{},{error: false}).then(res=>{
-							this.$app.popup.alert(res.msg);
 							this.get_userinfo()
 							setTimeout(()=>{
 								this.$app.storage.remove('FRIM_ID')
 							},500)
+							this.$app.popup.alert(res.msg);
 						}).catch(err=>{
-							this.$app.popup.alert(err.msg)
 							setTimeout(()=>{
 								this.$app.storage.remove('FRIM_ID')
 							},500)
+							// this.$app.popup.alert(err.msg)
 						})
 					}else{
 						uni.showModal({

pages/my/my.vue

@@ -76,7 +76,8 @@
 						<image src="@/static/img/my-icon05.svg" class="icon"></image>
 						<view class="name">隐私条例</view>
 					</view>
-					<view class="act-item" @click="openFilter()" v-if="userinfo.firmType==1">
+					<!-- firmUserType===1管理员，2普通用户 -->
+					<view class="act-item" @click="openFilter()" v-if="userinfo.firmUserType===1">
 						<image src="@/static/img/my-icon06.svg" class="icon"></image>
 						<view class="name">邀请员工</view>
 					</view>
@@ -186,7 +187,7 @@
 					})
 					//文字
 					await this.$refs.rCanvas.drawText({
-						text: '中数未来控股（深圳）有限责任公司',
+						text:this.userinfo.firmInfoName?this.userinfo.firmInfoName:'默认企业',
 						max_width: 0,
 						x: 56,
 						y: 348,
@@ -199,7 +200,7 @@
 						})
 					})
 					await this.$refs.rCanvas.drawText({
-						text: this.userinfo.nickName ? userinfo.nickName : '匿名用户',
+						text: this.userinfo.nickName ?this.userinfo.nickName : '匿名用户',
 						max_width: 0,
 						x: 122,
 						y: 486,

pages/site-more/site-more.vue

@@ -44,7 +44,7 @@
 					</view>
 					<view class="info">
 						<!-- v-if="user_info.firmId===null" -->
-						<view class="row" v-if="user_info.firmId===null">
+						<view class="row" v-if="user_info.firmId===null||$app.storage.get('USER_INFO').firmType===0">
 							<view class="name">抵扣券电价</view>
 							<view ><text class="value" >{{(item.price).toFixed(4)}}</text><text class="unit" >{{item.unit}}</text></view>
 						</view>

pages/site/site.vue

@@ -43,7 +43,7 @@
 						<image src="@/static/img/site-bg05.svg" class="bg" mode="heightFix"></image>
 					</view>
 					<!-- v-if="user_info.firmId===null" -->
-					<view class="price-wrap" v-if="user_info.firmId===null">
+					<view class="price-wrap" v-if="user_info.firmId===null||$app.storage.get('USER_INFO').firmType===0">
 						<view class="price">
 							<text class="symbol">￥</text>
 							<text>{{nowPriceTime.price?parseFloat(nowPriceTime.price).toFixed(4):"0.0000"}}</text>
@@ -106,7 +106,7 @@
 					<view class="price">
 						<text class="symbol">￥</text>
 						<!-- v-if="nowPriceTime.firmPrice===null" -->
-						<text v-if="nowPriceTime.firmPrice===null">{{nowPriceTime.price?nowPriceTime.price.toFixed(4):"0.0000"}}</text>
+						<text v-if="nowPriceTime.firmPrice===null||$app.storage.get('USER_INFO').firmType===0">{{nowPriceTime.price?nowPriceTime.price.toFixed(4):"0.0000"}}</text>
 						<text v-else>{{parseFloat(nowPriceTime.firmPrice).toFixed(4)}}</text>
 					</view>
 					<view class="unit">{{nowPriceTime.unit}}</view>

pages/terminal/terminal.vue

@@ -37,7 +37,8 @@
 							<view class="price-numer">{{accountInfo.balance}}</view>
 							<view class="price-text">剩余可抵扣充电余量</view>
 						</view>
-						<view class="shop-coupon-btn" :style="{backgroundColor: personal==1?'#FF6457':'#3EB6F8'}" @click="gotoCouponBuy">立即购券</view>
+						<view class="shop-coupon-btn" :style="{backgroundColor: personal==1?'#FF6457':'#3EB6F8'}"
+							@click="gotoCouponBuy">立即购券</view>
 					</view>
 					<!-- 					<view class="coupon" :class="{'personal':personal==1}">
 						<view class="name">{{personal == 1?'充电抵扣券':'集团抵扣券'}}</view>
@@ -80,7 +81,7 @@
 									元/度</text></view>
 						</view>
 					</view>
-					<view class="cell" v-if="nowPriceTime.firmPrice">
+					<view class="cell" v-if="nowPriceTime.firmPrice||$app.storage.get('USER_INFO').firmType===1">
 						<view class="lable">企业专享价</view>
 						<view class="contet app-flex middle">
 							<view><text
@@ -201,9 +202,9 @@
 				orderInfo: {}, //临时订单信息
 				checkNum: 0, //检测订单状态次数
 				ecInfo: {}, //集团信息
-				discountInfo: null ,//优惠信息
-				selectedImg:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/AwQTRxpEMqOG50293e26d86888b3e0f7324c429d2019.png/1.png',
-				defaultImg:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/SPh1u3KAqte830a107b2e3c5033b1d1027516d84d780.png/1.png'
+				discountInfo: null, //优惠信息
+				selectedImg: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/AwQTRxpEMqOG50293e26d86888b3e0f7324c429d2019.png/1.png',
+				defaultImg: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/SPh1u3KAqte830a107b2e3c5033b1d1027516d84d780.png/1.png'
 			}
 		},
 		methods: {
@@ -357,7 +358,6 @@
 
 				//判断账户余额是否大于两元
 				if ((this.accountInfo.balance - 3) <= 0) {
-
 					return this.$app.popup.confirm("无法启动充电，抵扣余量需大于3元，请先购买充电券！", "温馨提示！", {
 						confirmText: "立即购券"
 					}).then(confirm => {
@@ -369,9 +369,9 @@
 				//统一下单并启动接口
 				this.startChangeAndOrder();
 			},
-			
+
 			// 主动发起购券操作
-			gotoCouponBuy(){
+			gotoCouponBuy() {
 				this.$app.url.goto('/pages/coupon-buy/coupon-buy', true);
 			},
 			//统一下单并启动接口

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

@@ -101,7 +101,7 @@
 	margin-top: 20px;
 }
 .host-graph .image.data-v-79ba75a6{
-	width: 60vw;
+	width: 40vw;
 }
 /* 主参数 */
 .parameter.data-v-79ba75a6{
@@ -309,4 +309,41 @@
 		        transform: rotate(45deg);
 }
 }
+/* 充电loading动画 */
+.charge-loading-box.data-v-79ba75a6 {
+  margin: auto;
+  margin-top: 20rpx;
+}
+.charge-loading.data-v-79ba75a6 {
+  width: 364rpx;
+  height: 36rpx;
+  background: #FFFFFF;
+  border-radius: 18rpx;
+  overflow: hidden;
+}
+.c-loading.data-v-79ba75a6 {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(66deg, rgba(139, 243, 251, 0), #60C8FE, #53D4FF, rgba(139, 243, 251, 0.7));
+  border-radius: 18rpx;
+  -webkit-animation: loading-data-v-79ba75a6 3s linear infinite;
+          animation: loading-data-v-79ba75a6 3s linear infinite;
+  background-size: 200% 100%;
+}
+@-webkit-keyframes loading-data-v-79ba75a6 {
+0% {
+    background-position: 100% 0;
+}
+100% {
+    background-position: -100% 0;
+}
+}
+@keyframes loading-data-v-79ba75a6 {
+0% {
+    background-position: 100% 0;
+}
+100% {
+    background-position: -100% 0;
+}
+}
 

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

@@ -103,8 +103,11 @@ try {
     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))
     },
+    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))
+    },
     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 */ 201))
+      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))
     },
   }
 } catch (e) {
@@ -144,16 +147,25 @@ var render = function () {
   var l1 = _vm.__map(_vm.list.data, function (item, index) {
     var $orig = _vm.__get_orig(item)
     var g1 =
-      (_vm.user_info === null || _vm.user_info.firmId === null) &&
+      (_vm.user_info.firmType === 0 ||
+        _vm.user_info.firmId === null ||
+        _vm.user_info === null) &&
       item.params.nowPrice
         ? item.params.nowPrice.toFixed(4)
         : null
-    var g2 = !(_vm.user_info === null || _vm.user_info.firmId === null)
+    var g2 = !(
+      _vm.user_info.firmType === 0 ||
+      _vm.user_info.firmId === null ||
+      _vm.user_info === null
+    )
       ? item.params.firmPrice.toFixed(4)
       : null
     var g3 =
-      !(_vm.user_info === null || _vm.user_info.firmId === null) &&
-      item.params.nowPrice
+      !(
+        _vm.user_info.firmType === 0 ||
+        _vm.user_info.firmId === null ||
+        _vm.user_info === null
+      ) && item.params.nowPrice
         ? item.params.nowPrice.toFixed(4)
         : null
     return {
@@ -185,6 +197,9 @@ var render = function () {
     _vm.e6 = function ($event) {
       return _vm.$app.url.goto("/pages/map/map", false)
     }
+    _vm.e7 = function ($event) {
+      return _vm.$refs.filter.close()
+    }
   }
   _vm.$mp.data = Object.assign(
     {},
@@ -371,6 +386,12 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 var bmap = __webpack_require__(/*! static/js/bmap-wx.js */ 49);
 var _default = {
@@ -423,6 +444,9 @@ var _default = {
     }))();
   },
   mounted: function mounted() {
+    if (this.isAd) {
+      this.$refs.filter.open();
+    }
     this.setListHeight();
     this.setAppNavigationHeight();
     this.get_frimid();
@@ -430,6 +454,8 @@ var _default = {
   },
   data: function data() {
     return {
+      isAd: false,
+      playbil_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/XVsEVGuCCbNv4aee36cc2f76e7050f62ebad3080ad88.jpg/1.jpg',
       user_info: {},
       // 导航栏高度
       appNavigationHeight: 0,
@@ -548,16 +574,16 @@ var _default = {
           this.$api.base("post", "/userApi/add-firm-user?firmId=" + parseInt(this.$app.storage.get('FRIM_ID')), {}, {
             error: false
           }).then(function (res) {
-            _this3.$app.popup.alert(res.msg);
             _this3.get_userinfo();
             setTimeout(function () {
               _this3.$app.storage.remove('FRIM_ID');
             }, 500);
+            _this3.$app.popup.alert(res.msg);
           }).catch(function (err) {
-            _this3.$app.popup.alert(err.msg);
             setTimeout(function () {
               _this3.$app.storage.remove('FRIM_ID');
             }, 500);
+            // this.$app.popup.alert(err.msg)
           });
         } else {
           uni.showModal({

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

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "首页",
   "usingComponents": {
     "ax-body": "/components/ax-body/ax-body",
+    "ax-popup": "/components/ax-popup/ax-popup",
     "app-navigation": "/components/app-navigation/app-navigation"
   }
 }

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

@@ -371,6 +371,23 @@ app-navigation {
 	color: #AAAAAA;
 	text-decoration: line-through;
 }
+.ad-popup{
+}
+.close-get{
+	margin-left:550rpx;
+	width:50rpx;
+	height:50rpx;
+	border-radius: 50%;
+	border: 4rpx solid #3EB6F8;
+	color:#fff;
+	font-size: 30rpx;
+	font-weight: bold;
+	text-align: center;
+}
+.ad-image{
+	margin-top: 10rpx;
+	width:600rpx;
+}
 .discount{
 	flex: 1;
 	text-align: right;

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

@@ -104,10 +104,10 @@ try {
       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 */ 208))
+      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))
     },
     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 */ 201))
+      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))
     },
   }
 } catch (e) {

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

@@ -104,13 +104,13 @@ try {
       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 */ 208))
+      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))
     },
     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 */ 201))
+      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))
     },
   }
 } catch (e) {
@@ -294,6 +294,7 @@ var _config = _interopRequireDefault(__webpack_require__(/*! @/static/js/config.
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -396,7 +397,7 @@ var _default = {
                         case 10:
                           _context.next = 12;
                           return _this2.$refs.rCanvas.drawText({
-                            text: '中数未来控股（深圳）有限责任公司',
+                            text: _this2.userinfo.firmInfoName ? _this2.userinfo.firmInfoName : '默认企业',
                             max_width: 0,
                             x: 56,
                             y: 348,
@@ -411,7 +412,7 @@ var _default = {
                         case 12:
                           _context.next = 14;
                           return _this2.$refs.rCanvas.drawText({
-                            text: _this2.userinfo.nickName ? userinfo.nickName : '匿名用户',
+                            text: _this2.userinfo.nickName ? _this2.userinfo.nickName : '匿名用户',
                             max_width: 0,
                             x: 122,
                             y: 486,

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

@@ -104,7 +104,7 @@ try {
       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 */ 208))
+      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))
     },
   }
 } catch (e) {

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

@@ -149,17 +149,19 @@ var render = function () {
     ? _vm.__map(_vm.prices.data, function (item, index) {
         var $orig = _vm.__get_orig(item)
         var m6 = _vm.getPriceLable(item.timeType)
-        var g0 = _vm.user_info.firmId === null ? item.price.toFixed(4) : null
-        var g1 = !(_vm.user_info.firmId === null)
-          ? item.firmPrice.toFixed(4)
-          : null
-        var g2 = !(_vm.user_info.firmId === null) ? item.price.toFixed(4) : null
+        var g0 =
+          _vm.user_info.firmId === null ||
+          _vm.$app.storage.get("USER_INFO").firmType === 0
+        var g1 = g0 ? item.price.toFixed(4) : null
+        var g2 = !g0 ? item.firmPrice.toFixed(4) : null
+        var g3 = !g0 ? item.price.toFixed(4) : null
         return {
           $orig: $orig,
           m6: m6,
           g0: g0,
           g1: g1,
           g2: g2,
+          g3: g3,
         }
       })
     : null

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

@@ -126,14 +126,15 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 =
-    _vm.user_info.firmId === null && _vm.nowPriceTime.price
+    _vm.user_info.firmId === null ||
+    _vm.$app.storage.get("USER_INFO").firmType === 0
+  var g1 =
+    g0 && _vm.nowPriceTime.price
       ? parseFloat(_vm.nowPriceTime.price).toFixed(4)
       : null
-  var g1 = !(_vm.user_info.firmId === null)
-    ? parseFloat(_vm.nowPriceTime.firmPrice).toFixed(4)
-    : null
-  var g2 =
-    !(_vm.user_info.firmId === null) && _vm.nowPriceTime.price
+  var g2 = !g0 ? parseFloat(_vm.nowPriceTime.firmPrice).toFixed(4) : null
+  var g3 =
+    !g0 && _vm.nowPriceTime.price
       ? parseFloat(_vm.nowPriceTime.price).toFixed(4)
       : null
   var m0 = _vm.getStatusNum(1)
@@ -151,13 +152,12 @@ var render = function () {
       m5: m5,
     }
   })
-  var g3 =
-    _vm.nowPriceTime.firmPrice === null && _vm.nowPriceTime.price
-      ? _vm.nowPriceTime.price.toFixed(4)
-      : null
-  var g4 = !(_vm.nowPriceTime.firmPrice === null)
-    ? parseFloat(_vm.nowPriceTime.firmPrice).toFixed(4)
-    : null
+  var g4 =
+    _vm.nowPriceTime.firmPrice === null ||
+    _vm.$app.storage.get("USER_INFO").firmType === 0
+  var g5 =
+    g4 && _vm.nowPriceTime.price ? _vm.nowPriceTime.price.toFixed(4) : null
+  var g6 = !g4 ? parseFloat(_vm.nowPriceTime.firmPrice).toFixed(4) : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -165,12 +165,14 @@ var render = function () {
         g0: g0,
         g1: g1,
         g2: g2,
+        g3: g3,
         m0: m0,
         m1: m1,
         m2: m2,
         l0: l0,
-        g3: g3,
         g4: g4,
+        g5: g5,
+        g6: g6,
       },
     }
   )

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

@@ -143,7 +143,10 @@ var render = function () {
       ? parseFloat(_vm.discountInfo.discount).toFixed(4)
       : null
   var g3 =
-    _vm.nowPriceTime.firmPrice && _vm.nowPriceTime.firmPrice
+    _vm.nowPriceTime.firmPrice ||
+    _vm.$app.storage.get("USER_INFO").firmType === 1
+  var g4 =
+    g3 && _vm.nowPriceTime.firmPrice
       ? parseFloat(_vm.nowPriceTime.firmPrice).toFixed(4)
       : null
   var m2 = _vm.getPriceLable(_vm.nowPriceTime.timeType)
@@ -165,6 +168,7 @@ var render = function () {
         m1: m1,
         g2: g2,
         g3: g3,
+        g4: g4,
         m2: m2,
         m3: m3,
       },
@@ -347,6 +351,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   onLoad: function onLoad(opts) {
     console.log("参数信息：", opts);

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

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