Merge branch 'dev1.4' of http://222.85.201.140:10002//xuyunhui/chain_jje_uniapp into dev1.5

common/js/env.js

@@ -1,9 +1,9 @@
 "use strict";
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
-// let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 /** 测试环境 */
-let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
+// let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
 /** 开发环境*/
 // let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 // let baseUrl = `http://47.108.114.127:10888`

myPages/systemSwitch/index.vue

@@ -594,7 +594,7 @@ export default {
         if (!userInfo.phone) {
           uni.showModal({
             title: '温馨提示',
-            content: '资产找回涉及资金安全，需绑定手机号才能进行查询，是否确认绑定手机号',
+            content: '会员转入涉及资金安全，需绑定手机号才能进行查询，是否确认绑定手机号',
             success: res => {
               if (res.confirm) {
                 uni.navigateTo({

orderPages/bookService/index.vue

@@ -37,8 +37,8 @@
             </view>
           </view>
           <view class="h-row">
-            <text class="address">地址：{{ storeInfo.address }}</text>
-            <!-- <text class="address">距你1.8km</text> -->
+              <text class="address">地址：{{ storeInfo.address }}</text>
+			  <text class="address1">{{storeInfo.distanceDesc}}</text>
           </view>
         </view>
       </view>
@@ -863,9 +863,15 @@
 
           .address {
             color: #999999;
-            font-size: 12px;
-            padding-right: 12px;
+			  width: 450rpx;
+            font-size: 24rpx;
           }
+
+			.address1 {
+				color: #999999;
+				font-size: 24rpx;
+				padding-right: 40rpx;
+			}
         }
       }
 

orderPages/storeService/index.vue

@@ -22,7 +22,7 @@
           </view>
           <view class="h-row">
             <text class="address">地址：{{ storeInfo.address }}</text>
-            <!-- <text class="address">距你1.8km</text> -->
+			  <text class="address1">{{storeInfo.distanceDesc}}</text>
           </view>
         </view>
       </view>
@@ -529,9 +529,14 @@ background-color: white;
 
           .address {
             color: #999999;
-            font-size: 12px;
-            padding-right: 12px;
+			  width: 450rpx;
+            font-size:  24rpx;
           }
+			.address1 {
+				color: #999999;
+				font-size: 24rpx;
+				padding-right: 40rpx;
+			}
         }
       }
 

pages.json

@@ -304,7 +304,7 @@
 				{
 					"path": "systemSwitch/index",
 					"style": {
-						"navigationBarTitleText": "资产找回",
+						"navigationBarTitleText": "会员转入",
 						"enablePullDownRefresh": false
 					}
 				},

pages/my/index.vue

@@ -109,7 +109,7 @@ export default {
         // {thumb:'/static/me/u1803.png',title:'实名认证',rightText:'',to:'/myPages/realNameAuth/index'},
         {thumb: '/static/me/u1812.png', title: '服务对象管理', rightText: '', to: '/myPages/ServiceObjectManagement/index'},
         {thumb: '/static/me/u3.png', title: '邀请有礼', rightText: '', to: '/myPages/promotionCenter/index'},
-        {thumb: '/static/me/u1833.png', title: '资产找回', rightText: '', to: '/myPages/systemSwitch/index'},
+        {thumb: '/static/me/u1833.png', title: '会员转入', rightText: '', to: '/myPages/systemSwitch/index'},
         {thumb: '/static/me/u826.png', title: '储值服务', rightText: '', to: '/myPages/recharge/index'},
         {thumb: '/static/me/u701.png', title: '交易记录', rightText: '', to: '/myPages/transactionRecord/index'},
         {thumb: '/static/me/u11.png', title: '会员须知', rightText: '', to: '/myPages/aboutOur/index'},