Merge branch 'dev_7.1.0' into feature-zyw-sc

src/component/bottomTabs/bottomTabs.js

@@ -80,7 +80,7 @@ Component({
 						wxService.openCard()
 					}
 				} else if (curItemType.link.type == 6) {
-					wxService.router(`/${currentClickType}`)
+					wxService.router(`${currentClickType}`)
 				} else if (curItemType.link.type == 7) {
 					// 集点详情
 				  wxService.router(`${currentClickType}`)

src/config/index.js

@@ -2,14 +2,15 @@ const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
 const needMock = '' //
 
 // appid_dev_wx   wxc3b64b09b1d3dfc2
-// appid_test_wx  wx857ea77f4f7f4f34
+// appid_test_wx  wx857ea77f4f7f4f34 wxac09792264c49b5c
 // appid_pre_711  wx358b56af62edbde1
 // appid_prod_711  wx700028bf32a3be66 
 
 // 1 2 3 步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId
 
 // const devCtx = 'http://111.231.86.64'
-const devCtx = 'http://buyer.devapi.bigaka.net' // 开发环境
+const devCtx = 'http://buyer.devapi.bigaka.net' // 开发环境 1
+// const devCtx = 'http://dev-sellerapi.bigaka.net' // 开发环境 2
 const testCtx = 'https://crm-b.bigaka.net/api' // 发测试时解开此注释
 const preCtx = 'https://crm-b.bigaka.com/api' // 发预生产时解开此注释
 const prodCtx = 'https://crm-b.bigaka.com/api' // 发生产时解开此注释

src/pages/userCenter/userCenter.wxml

@@ -9,7 +9,7 @@
 			<person-center person-data="{{pItem.customer}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 3}}">
-			<pic-nav pic-nav="{{pItem.navigation.images}}" />
+			<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 4}}">
 			<bottom bottom="{{pItem.bottom}}" />

src/utils/common.js

@@ -51,7 +51,7 @@ HandlerLink.prototype = {
     } else if (type == 3) {
       return item
     } else if (type == 4) {
-      return `${item.link.url}`
+      return `${(item.link.url).trim()}`
     } else if (type == 5) {
       let currentOpen = ''
       if (item.link.url == 1) {
@@ -142,16 +142,10 @@ HandlerLinkRow.prototype = {
     } else if (type == 7) {
       return `${item.link.url}`
     } else if (type == 8) {
-      console.log('----', item)
       return `${item.url}`
     } else if (type == 9) {
-      console.log('----', item.name)
       return `id=${item.url}&name=${item.name}`
     }
-
-
-
-
   }
 }
 

src/wxs/utils.wxs

@@ -24,7 +24,6 @@ function formateUrl(url, BASE_IMG_URL){
     if(url){
       url = url.indexOf('http') > -1 ? url : BASE_IMG_URL + url;
     }
-    console.log('url', url)
     return url;
 }