价格显示bug修复

common/js/env.js

@@ -1,8 +1,8 @@
 "use strict";
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
-// let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
-let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
+let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+// let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
 // let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 
 // let baseUrl = `http://127.0.0.1:9000`

pages/index/index.vue

@@ -275,16 +275,15 @@ export default {
     }
   },
   onLoad(e) {
-
     if(e.q){
       const q = decodeURIComponent(e.q)
-      const params = new URLSearchParams(q);
-      let promotionStoreId = params.get('promotionStoreId')
-      let promotionUserId = params.get('promotionUserId')
-      console.log('promotionStoreId=>',promotionStoreId)
-      console.log('promotionUserId=>',promotionUserId)
-      uni.setStorageSync('promotionStoreId',promotionStoreId)
-      uni.setStorageSync('promotionUserId',promotionUserId)
+      let a = q.split('?')
+      let b=a[1].split('&')
+      let param={} //技师端分享过来的参数
+      for (let i=0;i<b.length;i++){
+        param[b[i].split('=')[0]] = b[i].split('=')[1]
+      }
+      console.log('param==============>',param)
     }
 
     uni.hideTabBar({

pages/order/module/mescrollUni-item.vue

@@ -124,10 +124,13 @@
 							<view class="price" v-if="item.serviceAttribute == 2">
 								预约金额：<text class="fontColor"> ￥{{ item.subAmount || 0}}</text>
 							</view>
-							<view class="price">
-								订单总金额：<text class="fontColor"> ￥{{ item.totalAmount || 0}}</text>
+							<view class="price" v-if="item.payAmount*1>0">
+								订单总金额：<text class="fontColor"> ￥{{ item.payAmount || 0}}</text>
 								<text :style="{'text-decoration':'line-through','margin-left':'15rpx', 'font-size':'20rpx'}">￥{{ item.totalAmount || 0}}</text>
 							</view>
+							<view class="price" v-else>
+								订单总金额：<text class="fontColor"> ￥{{ item.totalAmount || 0}}</text>
+							</view>
 						</view>
 						<view class="nav-bar">