Merge branch '蓝色' into 测试

packageA/receivables/index.js

@@ -27,7 +27,7 @@ Page({
       name: getApp().globalData.Language.getMapText('按客户'),
       value: 1
     }],
-    points: ['全部', '订单', '出货', '开票', '质保金'],
+    points: ['全部', '预付款', '出货款', '验收款', '质保金'],
     filtratelist: [],
     table: [{
       title: '客户名称',

pages/tabbar/message/details.js

@@ -106,10 +106,19 @@ Page({
 				title: res.data,
 				icon: "none"
 			});
-			this.setData({
-				"detailsData.name": res.data.isprivate ? '销售线索' : '公海线索',
-				"detailsData.path": res.data.isprivate ? '/packageA/saleClue/detail' : '/packageA/publicClue/detail',
-			})
+
+			if (res.data.isprivate == 1) {
+				this.setData({
+					"detailsData.name": '销售线索',
+					"detailsData.path": '/packageA/saleClue/detail',
+				})
+			} else {
+				this.setData({
+					"detailsData.name": res.data.allocationstatus == '已分配' ? '销售线索' : '公海线索',
+					"detailsData.path": res.data.allocationstatus == '已分配' ? '/packageA/saleClue/detail' : '/packageA/publicClue/detail',
+				})
+			}
+
 		});
 	},
 	saCustomer(sa_customersid) {

pages/tabbar/mine/webView.wxml

@@ -1 +1 @@
-<web-view src="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxfe6432513507d553&redirect_uri=http://oms.idcgroup.com.cn/getcode.html&response_type=code&scope=snsapi_base&state=#wechat_redirect"/>
+<web-view src="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxfe6432513507d553&redirect_uri=https://meida.cnyunl.com/getcodebng.html&response_type=code&Scope=snsapi_base&state=12312#wechat_redirect" />