Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

pages.json

@@ -417,7 +417,9 @@
             "navigationBarTitleText": "详情", // 用户主页
             "backgroundColor": "#ededed",
             "backgroundColorBottom": "#ededed",
-            "navigationStyle": "custom"
+            "navigationStyle": "custom",
+            "enablePullDownRefresh": false,
+            "disableScrollByUser": true
           }
         },
         {

root/detail/userShare.vue

@@ -9,11 +9,12 @@
 				<view
 					class="u-navbar-fixed"
 					:style="{
-						'background-image': `url(${agencyInfo.supplierAccountCoverUrl})` || 'url(https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/mbg.jpg)',
+						'background-image': info.supplierAccountCoverUrl ? `url(${info.supplierAccountCoverUrl})` : 'url(https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/mbg.jpg)',
 						'background-size': '100% 100%',
 						width: 'calc(100vw + ' + backgroundScale + 'px)',
 						height: 'calc(' + (100 / 1.78).toFixed(2) + 'vw + ' + backgroundScale + 'px)',
-						zoom: 1 + backgroundScale * 0.018,
+						'transform-origin': '50% 0%',
+						transform: `scale(${1 + backgroundScale * 0.008})`,
 					}"
 				>
 				</view>
@@ -133,6 +134,9 @@ export default {
 		quickLogin,
 		applyFlow,
 	},
+	onPullDownRefresh() {
+		uni.stopPullDownRefresh();
+	},
 	onReady() {
 		this.G.setNavStyle();
 	},

utils/common.js

@@ -14,7 +14,7 @@ let data = {
       loginText: '请登录',
       coziID: '7537572244600471579',
       baseUrl: "https://daotian.matripe.com.cn",// 网络请求的基础路径
-      // baseUrl: "http://192.168.1.87:8001", // 网络请求的基础路径
+      // baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
       // #ifdef MP-WEIXIN
       version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",
       // #endif