pages/index/index.vue

@@ -101,11 +101,11 @@
 									</view>
 									<view class="price">
 										<!-- v-if="user_info.firmId===null" -->
-										<view class="app-flex middle" style="color: #FF5D50;">
+										<view class="app-flex middle" style="color: #FF5D50;" v-if="user_info||user_info.firmId===null">
 											<text class="value">{{item.params.nowPrice?item.params.nowPrice.toFixed(4):"0.0000"}}</text>
 											<text class="unit">元/度</text>
 										</view>
-<!-- 										<view class="app-flex middle" v-else>
+										<view class="app-flex middle" v-else>
 											<view class="card-bottom-text">
 												<text>{{item.params.firmPrice.toFixed(4)}}</text>
 												<text class="mini-text">元/度</text>
@@ -114,7 +114,7 @@
 												企业专享价
 											</view>
 											<view class="ordinary-price">{{item.params.nowPrice?item.params.nowPrice.toFixed(4):"0.0000"}}</view>
-										</view> -->
+										</view>
 										<view>{{item.params.priceShow}}</view>
 									</view>
 								</view>
@@ -245,7 +245,7 @@
 		},
 		methods: {
 			get_userinfo(){
-				this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(res => {
+				this.$api.base("post", "/userApi/getUserAccount", {}, {error:false}).then(res => {
 					this.user_info = res.accountInfo
 					this.$app.storage.set('USER_INFO', res.accountInfo);
 				})

pages/my/my.vue

@@ -255,7 +255,7 @@
 			getMyAccount() {
 				// let channelUrl = 'http://192.168.110.241:9120/zs/channel/admin/'
 				let channelUrl='https://channel-api.zonelife.cn/zs/channel/admin/'
-				this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(res => {
+				this.$api.base("post", "/userApi/getUserAccount", {}, {error:false}).then(res => {
 					this.userinfo = res.accountInfo
 					this.$app.storage.set('USER_INFO', res.accountInfo);
 					// 识别用户是否通过分销码进入小程序

pages/order-detail/order-detail.vue

@@ -33,6 +33,7 @@
 				<view class="cell"><view class="lable">服务费</view><view class="contet">{{clcaServicePrice(orderInfo)}}元</view></view> -->
 				<view class="hr"></view>
 				<view class="cell" v-if="orderInfo.discountMoney"><view class="lable">{{orderInfo.discountDes}}</view><view class="contet sum">-{{orderInfo.discountMoney?orderInfo.discountMoney.toFixed(4):"0.0000"}}元</view></view>
+				<view class="cell" v-if="orderInfo.firmPrice"><view class="lable">企业专享价减</view><view class="contet sum">-{{orderInfo.firmPrice?orderInfo.firmPrice.toFixed(4):"0.0000"}}元</view></view>
 				<view class="cell"><view class="lable">实际结算费用</view><view class="contet sum">{{orderInfo.realCost?orderInfo.realCost.toFixed(4):"0.0000"}}元</view></view>
 			</view>
 			<view class="tips">

pages/order/order.css

@@ -127,12 +127,11 @@ ax-body >>> .ax-custom-title{
 }
 .list .item .money{
 	text-align: center;
-	font-size: 16px;
-	color: #FF4D3A;
+	font-size: 26rpx;
+	/* color: #FF4D3A; */
 	margin-top: 6px;
 }
 .list .item .money:before{
-	content: '￥';
 	display: inline-block;
 	font-size: 10px;
 	transform: translateY(-1px);

pages/order/order.vue

@@ -25,7 +25,11 @@
 					</view>
 					<view class="bottom">
 						<view class="money-txt">充电费用：</view>
-						<view class="money">{{item.realCost.toFixed(4) || ''}}</view>
+						<view class="money">
+							<text style="color:red;" v-if="item.discountMoney||item.firmPrice">共减 ￥{{(item.discountMoney+item.firmPrice).toFixed(4)}}</text>
+							<text style="width: 20rpx;display: inline-block;"></text>
+							<text :style="{color:`${item.discountMoney||item.firmPrice?'':'red'}`}"><text v-if="item.discountMoney||item.firmPrice">实付</text> ￥{{item.realCost.toFixed(4) || ''}}</text>
+						</view>
 					</view>
 				</view>
 				<view v-if="orders.data.length==0" class="empty">

pages/site-more/site-more.vue

@@ -44,11 +44,11 @@
 					</view>
 					<view class="info">
 						<!-- v-if="user_info.firmId===null" -->
-						<view class="row">
+						<view class="row" v-if="user_info.firmId===null">
 							<view class="name">抵扣券电价</view>
 							<view ><text class="value" >{{(item.price).toFixed(4)}}</text><text class="unit" >{{item.unit}}</text></view>
 						</view>
-<!-- 						<view class="operation-price-box" v-else>
+						<view class="operation-price-box" v-else>
 							<view class="operation-price">
 								<text class="operation-symbol">￥</text>
 								<text>{{(item.firmPrice).toFixed(4)}}</text>
@@ -58,7 +58,7 @@
 								企业专享价
 							</view>
 							<view class="ordinary-price">{{(item.price).toFixed(4)}}</view>
-						</view> -->
+						</view>
 						<!-- <view class="row">
 							<view class="name">服务费</view>
 							<view><text class="value">{{(item.addServicePrice+item.servicePrice).toFixed(4)}}</text><text class="unit">{{item.unit}}</text></view>

pages/site/site.vue

@@ -43,14 +43,14 @@
 						<image src="@/static/img/site-bg05.svg" class="bg" mode="heightFix"></image>
 					</view>
 					<!-- v-if="user_info.firmId===null" -->
-					<view class="price-wrap">
+					<view class="price-wrap" v-if="user_info.firmId===null">
 						<view class="price">
 							<text class="symbol">￥</text>
 							<text>{{nowPriceTime.price?parseFloat(nowPriceTime.price).toFixed(4):"0.0000"}}</text>
 						</view>
 						<view class="unit">元/度</view>
 					</view>
-<!-- 					<view class="price-wrap" v-else>
+					<view class="price-wrap" v-else>
 						<view class="operation-price">
 							<text class="operation-symbol">￥</text>
 							<text>{{parseFloat(nowPriceTime.firmPrice).toFixed(4)}}</text>
@@ -60,7 +60,7 @@
 							企业专享价
 						</view>
 						<view class="ordinary-price">{{nowPriceTime.price?parseFloat(nowPriceTime.price).toFixed(4):"0.0000"}}</view>
-					</view> -->
+					</view>
 				</view>
 			</view>
 			<!-- 充电终端 -->
@@ -106,8 +106,8 @@
 					<view class="price">
 						<text class="symbol">￥</text>
 						<!-- v-if="nowPriceTime.firmPrice===null" -->
-						<text>{{nowPriceTime.price?nowPriceTime.price.toFixed(4):"0.0000"}}</text>
-						<!-- <text v-else>{{parseFloat(nowPriceTime.firmPrice).toFixed(4)}}</text> -->
+						<text v-if="nowPriceTime.firmPrice===null">{{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>
 				</view>

static/js/config.js

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

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

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

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

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8923,7 +8923,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8944,14 +8944,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9047,7 +9047,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"chargingPile","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -10841,9 +10841,10 @@ var config = {};
 // 地址类
 config.url = {
   // API请求基础URL
-  request: 'https://charge.hub.zswlgz.com/',
+  // request : 'https://charge.hub.zswlgz.com/',
   // request : 'http://192.168.1.34:80/',
   // request : 'http://120.78.228.211:8866/',
+  request: 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: 'http://127.0.0.1:3000/upload/',
   // 下载地址

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

@@ -143,10 +143,22 @@ var render = function () {
       : null
   var l1 = _vm.__map(_vm.list.data, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g1 = item.params.nowPrice ? item.params.nowPrice.toFixed(4) : null
+    var g1 =
+      (_vm.user_info || _vm.user_info.firmId === null) && item.params.nowPrice
+        ? item.params.nowPrice.toFixed(4)
+        : null
+    var g2 = !(_vm.user_info || _vm.user_info.firmId === null)
+      ? item.params.firmPrice.toFixed(4)
+      : null
+    var g3 =
+      !(_vm.user_info || _vm.user_info.firmId === null) && item.params.nowPrice
+        ? item.params.nowPrice.toFixed(4)
+        : null
     return {
       $orig: $orig,
       g1: g1,
+      g2: g2,
+      g3: g3,
     }
   })
   if (!_vm._isMounted) {
@@ -519,7 +531,9 @@ var _default = {
   methods: {
     get_userinfo: function get_userinfo() {
       var _this2 = this;
-      this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(function (res) {
+      this.$api.base("post", "/userApi/getUserAccount", {}, {
+        error: false
+      }).then(function (res) {
         _this2.user_info = res.accountInfo;
         _this2.$app.storage.set('USER_INFO', res.accountInfo);
       });

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

@@ -487,7 +487,9 @@ var _default = {
       var _this5 = this;
       // let channelUrl = 'http://192.168.110.241:9120/zs/channel/admin/'
       var channelUrl = 'https://channel-api.zonelife.cn/zs/channel/admin/';
-      this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(function (res) {
+      this.$api.base("post", "/userApi/getUserAccount", {}, {
+        error: false
+      }).then(function (res) {
         _this5.userinfo = res.accountInfo;
         _this5.$app.storage.set('USER_INFO', res.accountInfo);
         // 识别用户是否通过分销码进入小程序

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

@@ -131,7 +131,11 @@ var render = function () {
     _vm.orderInfo.discountMoney && _vm.orderInfo.discountMoney
       ? _vm.orderInfo.discountMoney.toFixed(4)
       : null
-  var g1 = _vm.orderInfo.realCost ? _vm.orderInfo.realCost.toFixed(4) : null
+  var g1 =
+    _vm.orderInfo.firmPrice && _vm.orderInfo.firmPrice
+      ? _vm.orderInfo.firmPrice.toFixed(4)
+      : null
+  var g2 = _vm.orderInfo.realCost ? _vm.orderInfo.realCost.toFixed(4) : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -140,6 +144,7 @@ var render = function () {
         m1: m1,
         g0: g0,
         g1: g1,
+        g2: g2,
       },
     }
   )
@@ -227,6 +232,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   onLoad: function onLoad(opts) {
     console.log("启动充值页面的参数：", opts);

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

@@ -132,16 +132,21 @@ var render = function () {
     var $orig = _vm.__get_orig(item)
     var m0 = _vm.getSates(item)
     var m1 = _vm.getSates(item)
-    var g0 = item.realCost.toFixed(4) || ""
+    var g0 =
+      item.discountMoney || item.firmPrice
+        ? (item.discountMoney + item.firmPrice).toFixed(4)
+        : null
+    var g1 = item.realCost.toFixed(4) || ""
     return {
       $orig: $orig,
       m0: m0,
       m1: m1,
       g0: g0,
+      g1: g1,
     }
   })
-  var g1 = _vm.orders.data.length
   var g2 = _vm.orders.data.length
+  var g3 = _vm.orders.data.length
   if (!_vm._isMounted) {
     _vm.e0 = function ($event, index) {
       var _temp = arguments[arguments.length - 1].currentTarget.dataset,
@@ -156,8 +161,8 @@ var render = function () {
     {
       $root: {
         l0: l0,
-        g1: g1,
         g2: g2,
+        g3: g3,
       },
     }
   )
@@ -271,6 +276,10 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   onLoad: function onLoad() {
     this.shortcut({

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

@@ -124,12 +124,11 @@ ax-body.data-v-127632e4 .ax-custom-title{
 }
 .list .item .money.data-v-127632e4{
 	text-align: center;
-	font-size: 16px;
-	color: #FF4D3A;
+	font-size: 26rpx;
+	/* color: #FF4D3A; */
 	margin-top: 6px;
 }
 .list .item .money.data-v-127632e4:before{
-	content: '￥';
 	display: inline-block;
 	font-size: 10px;
 	-webkit-transform: translateY(-1px);

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

@@ -149,11 +149,17 @@ 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 = item.price.toFixed(4)
+        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
         return {
           $orig: $orig,
           m6: m6,
           g0: g0,
+          g1: g1,
+          g2: g2,
         }
       })
     : null

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

@@ -125,9 +125,17 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.nowPriceTime.price
-    ? parseFloat(_vm.nowPriceTime.price).toFixed(4)
+  var g0 =
+    _vm.user_info.firmId === null && _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
+      ? parseFloat(_vm.nowPriceTime.price).toFixed(4)
+      : null
   var m0 = _vm.getStatusNum(1)
   var m1 = _vm.getStatusNum(2)
   var m2 = _vm.getStatusNum(0)
@@ -143,17 +151,26 @@ var render = function () {
       m5: m5,
     }
   })
-  var g1 = _vm.nowPriceTime.price ? _vm.nowPriceTime.price.toFixed(4) : null
+  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
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         g0: g0,
+        g1: g1,
+        g2: g2,
         m0: m0,
         m1: m1,
         m2: m2,
         l0: l0,
-        g1: g1,
+        g3: g3,
+        g4: g4,
       },
     }
   )

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

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