commit -m 采美豆, 协议优化

App.vue

@@ -112,15 +112,7 @@
 			refresh(){
 				let TIME = (20*60)*1000;
 				setInterval(()=>{
-					authorize.getSetting().then(res =>{
-						console.log('用户是否授权过',res)
-						if(res == 1){
-							this.getWxAuthorize()
-						}else{
-							console.log(new Date +'用户未授权微信信息')
-							this.$api.navigateTo('/pages/authorization/authorization')
-						}
-					})
+					this.getWxAuthorize()
 				},TIME)
 			},
 			diffTime(t){

components/cm-module/modelAlert/order-alert.vue

@@ -113,7 +113,7 @@
 				top: -53rpx;
 				width: 100%;
 				height: 232rpx;
-				background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/alert%402x.png) no-repeat;
+				background: url(https://static.caimei365.com/app/img/icon/icon-orderAlert@2x.png) no-repeat;
 				background-size: contain;
 			}
 			.text-content{

components/cm-module/pageTemplate/templateA.vue

@@ -167,7 +167,6 @@
 		methods:{
 			initData(data){
 				this.floorData = data
-				console.log('userIdentity',this.userIdentity)
 				this.$api.getStorage().then((resolve) =>{
 					this.shopId = resolve.shopId ? resolve.shopId : 0
 				}).catch(err => {

components/cm-module/pageTemplate/templateH.vue

@@ -156,7 +156,6 @@
 		},
 		created(){
 			this.initData(this.pageData)
-			console.log(this.userIdentity)
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo','isActivity']),

components/cm-module/productDetails/secondRecommend.vue

@@ -2,7 +2,7 @@
 	<!-- 供应商信息 -->
 	<view class="recommend clearfix">
 		<view class="recommend-empty" v-if="isEmpty">
-			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/recmmmd.png"></image>
+			<image src="https://static.caimei365.com/app/img/icon/icon-prnone.png"></image>
 			<text>暂无相关推荐商品</text>
 		</view>
 		<view class="recommend-list" v-else>

h5/pages/activity/activity_mid.vue

@@ -239,15 +239,8 @@
 				this.$api.navigateTo(`/pages/goods/product?id=${item.productID}&path=activity`)
 			},
 			navigator(){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.$store.commit('setLoginType',9)
-						this.$api.navigateTo('/pages/login/login?type=0')
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})
+				this.$store.commit('setLoginType',9)
+				this.$api.navigateTo('/pages/login/login?type=0')
 			},	
 			toFixedFn(text){//处理小数点后两位数
 				return Number(text).toFixed(2);
@@ -565,7 +558,6 @@
 		width: 100%;
 		height:auto;
 		overflow: hidden;
-		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/08/tab%402x.png)no-repeat;
 		background-size: contain;
 		padding-bottom: 20rpx;
 		.home-flex-tab {

pages.json

@@ -47,33 +47,15 @@
 					}
 				},
 				{
-					"path": "shoppingnotice",
-					"style": {
-						"navigationBarTitleText": "购物须知"
-					}
-				},
-				{
-					"path": "organagree",
-					"style": {
-						"navigationBarTitleText": "机构协议"
-					}
-				},
-				{
-					"path": "useragree",
-					"style": {
-						"navigationBarTitleText": "用户协议"
-					}
-				},
-				{
-					"path": "supplieragree",
+					"path": "service",
 					"style": {
-						"navigationBarTitleText": "供应商协议"
+						"navigationBarTitleText": "采美365网"
 					}
 				},
 				{
-					"path": "privacyagree",
+					"path": "shoppingnotice",
 					"style": {
-						"navigationBarTitleText": "隐私权政策"
+						"navigationBarTitleText": "购物须知"
 					}
 				},
 				{

pages/goods/cart.vue

@@ -236,15 +236,7 @@
 				})	
 			},
 			initLogin(){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.$api.redirectTo('/pages/login/login?type=4')
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})
+				this.$api.redirectTo('/pages/login/login?type=4')
 			},
 			clickPopupShow(pros,type){
 				this.popupShow = true;

pages/goods/good-floor.vue

@@ -54,14 +54,7 @@
 		},
 		onLoad(option) {
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			this.pageId = option.linkId
 			this.$api.getComStorage('userInfo').then((resolve) =>{

pages/goods/goods-active.vue

@@ -222,7 +222,6 @@
 		height: 242rpx;
 		box-sizing: border-box;
 		padding:21rpx 24rpx 23rpx 24rpx;
-		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/09/%E8%83%8C%E6%99%AF%E5%9B%BE.png) no-repeat;
 		background-size: cover;
 		.name{
 			width: 100%;

pages/goods/goods-classify.vue

@@ -241,14 +241,7 @@
 		onLoad(option) {
 			console.log(option)
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			this.SetScrollHeight()
 			this.InitOption(option)

pages/goods/instrument-details.vue

@@ -207,14 +207,7 @@
 				this.backPage = option.page
 			}
 			if(this.isShareType =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 		},
 		methods:{

pages/goods/product.vue

@@ -369,14 +369,7 @@
 				this.backPage = option.page
 			}
 			if(this.isShareType =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			this.getWinHeight()
 		},
@@ -502,32 +495,40 @@
 				console.log(e.detail.query)
 			},
 			buyProductCart(){//底部购物车按钮点击
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						if(this.hasLogin){
-							this.$api.navigateTo('/pages/goods/cart')
-						}else{
-							this.$api.navigateTo('/pages/login/login?type=1')
-						}
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})
+				if(this.hasLogin){
+					this.$api.navigateTo('/pages/goods/cart')
+				}else{
+					this.$api.navigateTo('/pages/login/login?type=1')
+				}
 			},
 			btnGetConfirm(type){//加入购物车&&立即购买点击
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						if(this.hasLogin){
-							this.showSpec(type);
-						}else{
-							this.$api.navigateTo('/pages/login/login?type=1')
-						}
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
+				if(this.hasLogin){
+					switch(type){
+						case 'add':
+							// 友盟埋点商品详情加入购物车点击事件
+							if(process.env.NODE_ENV != 'development'){
+								this.$uma.trackEvent('Um_Event_ProductAddCart', {
+									Um_Key_PageName: '加入购物车',
+									Um_Key_SourcePage: '商品详情',
+									Um_Key_ProductID:`${this.product.productId}`
+								})
+							}
+							break;
+						case 'buy':
+							// 友盟埋点商品详情立即购买点击事件
+							if(process.env.NODE_ENV != 'development'){
+								this.$uma.trackEvent('Um_Event_ProductBuyConfirm', {
+									Um_Key_PageName: '立即购买',
+									Um_Key_SourcePage: '商品详情',
+									Um_Key_ProductID:`${this.product.productId}`
+								})
+							}
+							break;
 					}
-				})
+					this.showSpec(type);
+				}else{
+					this.$api.navigateTo('/pages/login/login?type=1')
+				}
 			},	
 			changeCountAdd(){//popup弹窗数量增加按钮
 				if(this.buyRetailPriceStep == 2){
@@ -593,6 +594,14 @@
 				}, 200);
 			},
 			btnConfirm() {//加入购物车&&立即购买跳转订单页并关闭弹窗
+				// 友盟埋点商品详情确认购买商品点击事件
+				if(process.env.NODE_ENV != 'development'){
+					this.$uma.trackEvent('Um_Event_ProductShoppingConfirm', {
+						Um_Key_PageName: '商品购买确认',
+						Um_Key_SourcePage: '商品详情',
+						Um_Key_ProductID:`${this.product.productId}`
+					})
+				}
 				if(this.isBtnType == 'add'){				
 					this.getAddProductCart()				
 				}else{
@@ -624,18 +633,6 @@
 					this.$util.msg(error.msg,2000);
 				})
 			},
-			navToLogin(){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.$store.commit('setLoginType',8)
-						this.$store.commit('setLoginProductId',this.productID)
-						this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})
-			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
 				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();

pages/login/apply-supplier.vue

@@ -197,9 +197,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/supplieragree')">《供应商协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1035&title=供应商协议')">《供应商协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row ">

pages/login/apply.vue

@@ -431,9 +431,16 @@
 						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
 						mainProduct:this.mainProduct,
 				}
+				// 友盟埋点普通机构确认升级点击事件
+				if(process.env.NODE_ENV != 'development'){
+					this.$uma.trackEvent('Um_Event_ConfirmClubUpgrade', {
+						Um_Key_ClubName: `${this.clubName}`,
+						Um_Key_PageName: '普通机构确认升级',
+						Um_Key_SourcePage: '升级页面',
+					})
+				}
 				this.UserService.OrganizationRegister(params).then(response =>{
 					this.isConfirmShow = true
-					
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})

pages/login/bindOperator.vue

@@ -104,16 +104,7 @@
 			console.log(option)
 			uni.setStorageSync('bind_id', option.userID);
 			this.getVerificationCode()
-			authorize.getSetting().then(res =>{
-				console.log('用户是否授权过',res)
-				if(res == 1){
-					this.getWxAuthorize()
-				}else{
-					console.log(new Date +'用户未授权微信信息')
-					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					this.isUserInfo = true
-				}
-			})	
+			this.getWxAuthorize()
 		},
 		methods:{
 			...mapMutations(['login','logout','wxLogin']),

pages/login/binding.vue

@@ -298,15 +298,7 @@
 			}
 		},
 		onShow() {
-			authorize.getSetting().then(res =>{
-				console.log('用户是否授权过',res)
-				if(res == 1){
-					this.getWxAuthorize()
-				}else{
-					console.log(new Date +'用户未授权微信信息')
-					this.$api.navigateTo('/pages/authorization/authorization')
-				}
-			})
+			this.getWxAuthorize()
 		}
 	}
 </script>

pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
+			<image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
 		</view>
 		<view class="login-form">
 			<view class="login-input">
@@ -63,15 +63,7 @@
 					this.$util.msg('请输入密码',2000)
 					return
 				}
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.AorganizationLogin()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})
+				this.AorganizationLogin()
 			},
 			AorganizationLogin(){
 				this.UserService.AorganizationLogin(this.params)
@@ -98,15 +90,7 @@
 				this.isShowEye = !this.isShowEye;
 			},
 			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginQuick()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})	
+				wxLogin.wxLoginQuick()	
 			}
 		},
 		onShow() {

pages/login/logincode.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
+			<image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
 		</view>
 		<view class="login-input">
 			<input type="number" 
@@ -98,12 +98,7 @@
 				})
 			},
 			InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginQuick()
-					}
-				})
+				wxLogin.wxLoginQuick()
 			}
 		},
 		onShow() {

pages/login/register-select.vue

@@ -20,7 +20,6 @@
 				</view>
 			</view>
 		</view>
-		<image class="bg_image" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E8%83%8C%E6%99%AF.png" mode=""></image>
 	</view>
 </template>
 

pages/login/register-supplier.vue

@@ -260,9 +260,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/supplieragree')">《供应商协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1035&title=供应商协议')">《供应商协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row ">
@@ -683,15 +683,7 @@
 			}
 		},
 		onShow() {
-			authorize.getSetting().then(res =>{
-				console.log('用户是否授权过',res)
-				if(res == 1){
-					wxLogin.wxLoginQuick()
-				}else{
-					console.log(new Date +'用户未授权微信信息')
-					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}
-			})
+			wxLogin.wxLoginQuick()
 		}
 	}
 </script>

pages/login/register.vue

@@ -3,7 +3,7 @@
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="register-main clearfix">
 			<view class="register-logo">
-				<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
+				<image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
@@ -48,9 +48,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row ">
@@ -180,6 +180,13 @@
 						self.params.nickName = res.userInfo.nickName
 						self.params.avatarUrl = res.userInfo.avatarUrl
 						self.UserRegisterClub(self.params)
+						// 友盟自定义事件
+						if(process.env.NODE_ENV != 'development'){
+							self.$uma.trackEvent('Um_Event_ConfirmRegister', {
+								Um_Key_PageName: '注册机构',
+								Um_Key_PageCategory: '注册机构页面',
+							})
+						}
 					},
 					fail() {
 						self.$util.msg('授权失败', 2000)
@@ -190,7 +197,7 @@
 				this.UserService.UserRegisterClub(params).then(response =>{
 					wxLogin.wxLoginAuthorize()
 					setTimeout(() =>{
-						this.$api.switchTabTo('/pages/tabBar/user/user?beanType=1')
+						this.$api.switchTabTo('/pages/tabBar/user/user')
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -249,15 +256,7 @@
 				}
 			},
 			async InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginQuick()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})
+				wxLogin.wxLoginQuick()
 			}
 		},
 		onShow() {
@@ -270,7 +269,6 @@
 	.register{
 		width: 100%;
 		height: 100%;
-		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E8%83%8C%E6%99%AF.png) no-repeat left bottom;
 		box-sizing: border-box;
 		background-size: contain;
 		.register-main{

pages/service/privacyagree.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				
-			}
-		},
-		onLoad(){
-			this.initData();
-		},
-		methods:{
-			initData(){
-				this.OtherService.QueryClubProtocol({helpPageID:1013}).then(response =>{
-					let data =response.data.content
-					this.$refs.childTemplate.html = this.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/organagree.vue → pages/service/service.vue

@@ -16,12 +16,13 @@
 				
 			}
 		},
-		onLoad(){
-			this.initData();
+		onLoad(option){
+			this.initData(option);
 		},
 		methods:{
-			initData(){
-				this.OtherService.QueryClubProtocol({helpPageID:1036}).then(response =>{
+			initData(option){
+				uni.setNavigationBarTitle({title:option.title});
+				this.OtherService.QueryClubProtocol({helpPageID:option.id}).then(response =>{
 					let data =response.data.content
 					this.$refs.childTemplate.html = this.$api.adaptRichTextImg(data);
 				}).catch(error =>{

pages/service/shoppingnotice.vue

@@ -23,13 +23,12 @@
 		},
 		methods:{
 			initData(){
-				let self = this;
 				this.CommonService.QueryAfterSale().then(response =>{
-					let _data =response.data,
-						type = self.type;
+					let _data =response.data;
+					let	type = this.type;
 					if(type) {
-						let html = self.$api.adaptRichTextImg(_data[type]);
-						self.$refs.childTemplate.html = html;
+						let html = this.$api.adaptRichTextImg(_data[type]);
+						this.$refs.childTemplate.html = html;
 					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);

pages/service/supplieragree.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				
-			}
-		},
-		onLoad(){
-			this.initData();
-		},
-		methods:{
-			initData(){
-				this.OtherService.QueryClubProtocol({helpPageID:1035}).then(response =>{
-					let data =response.data.content
-					this.$refs.childTemplate.html = this.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/useragree.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				type: ''
-			}
-		},
-		onLoad(){
-			this.type = 'afterSale';
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				this.OtherService.QueryClubProtocol({helpPageID:1023}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/tabBar/cart/cart.vue

@@ -224,15 +224,7 @@
 				})	
 			},
 			initLogin(){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.$api.redirectTo('/pages/login/login?type=4')
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})
+				this.$api.redirectTo('/pages/login/login?type=4')
 			},
 			clickPopupShow(pros,type){
 				this.popupShow = true;

pages/tabBar/home/index.vue

@@ -128,7 +128,6 @@
 				this.CommonService.GetHomeInit({source:2}).then(response =>{
 					let data = response.data
 					this.navBarsList = data.topMenuList
-					console.log(this.navBarsList);
 					this.isNavRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -200,18 +199,12 @@
 				this.isActivityBean = false
 			},
 			InitAuthorize(){ //是否已授权 
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.GetWxAuthorize()
-					}else{
-						this.$api.getComStorage('userInfo').then((resolve) =>{
-							this.userID = resolve.userId ? resolve.userId :0;
-							this.getHomeInformation()
-						}).catch(error =>{
-							this.getHomeInformation()
-						})
-					}
+				this.GetWxAuthorize()
+				this.$api.getComStorage('userInfo').then((resolve) =>{
+					this.userID = resolve.userId ? resolve.userId :0;
+					this.getHomeInformation()
+				}).catch(error =>{
+					this.getHomeInformation()
 				})
 			}
 		},

pages/tabBar/user/user.vue

@@ -20,13 +20,12 @@
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1" @click="navigator('/pages/login/login')">账号登录</text><text class="u-h1 line">|</text>
-							<text class="u-h1" @click="navigatorNex('/pages/login/register-select')">立即注册</text>
-							<!-- <text class="u-h1" @click="navigatorNex('/pages/login/register','2')">立即注册</text> -->
+							<text class="u-h1" @click="navigatorRegirst('/pages/login/register-select')">立即注册</text>
 						</view>
 						<view class="user-item">
 							<text class="u-p" @click="navigator('/pages/login/login')">登录商城了解更多产品信息吧！</text>
 						</view>
-						<view class="user-item" @click="navigatorNex('/pages/login/logincode','3')">
+						<view class="user-item" @click="navigatorNex('/pages/login/logincode')">
 							<view class="u-btn"><text>邀请码登录</text><text class="iconfont icon-xiangyouhuabeifen"></text></view>
 						</view>
 					</view>
@@ -46,7 +45,7 @@
 								<view class="main-account-text">账户余额</view>
 							</view>
 							<view class="main-account-ri-view" @click="navigator('/pages/user/account/account-bean')">
-								<view class="main-account-icon">{{ userBeans }}</view>
+								<view class="main-account-icon">{{ userBeans ? userBeans : 0  }}</view>
 								<view class="main-account-text">采美豆</view>
 							</view>
 						</view>
@@ -126,7 +125,7 @@
 					<image src="http://static.caimei365.com/app/meibohui/app/activity-in.png" mode=""></image>
 				</view> -->
 				<view class="list-cell-item" v-show="hasLogin">
-					<view class="list-cell" v-show="userIdentity == 4" @click="navigator(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
+					<view class="list-cell" v-show="userIdentity == 4" @click="navigatorClubUpgrade(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
 						<text class="cell-icon"><text class="iconfont icon-shengjihuiyuanjigou"></text></text>
 						<text class="cell-tit">
 							升级会员机构
@@ -309,33 +308,39 @@
 				this.isActivityBean = false
 			},
 			navigator(url){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						if(this.hasLogin){
-							this.$api.navigateTo(url)
-						}else{
-							this.$api.navigateTo('/pages/login/login?type=0')
-						}
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})
+				if(this.hasLogin){
+					this.$api.navigateTo(url)
+				}else{
+					this.$api.navigateTo('/pages/login/login?type=0')
+				}
 			},	
-			navigatorNex(url,type){
-				console.log(this.isWxAuthorize)
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						if(!this.hasLogin){
-							this.$api.navigateTo(url)
-						}
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
+			navigatorRegirst(url){
+				if(!this.hasLogin){
+					// 友盟埋点注册入口点击事件
+					if(process.env.NODE_ENV != 'development'){
+						this.$uma.trackEvent('Um_Event_zhuce', {
+							Um_Key_PageName: '立即注册',
+							Um_Key_SourcePage: '个人中心',
+						})
 					}
-				})
+					this.$api.navigateTo(url)
+				}
+			},
+			navigatorClubUpgrade(url){
+				// 友盟埋点普通机构升级点击事件
+				if(process.env.NODE_ENV != 'development'){
+					this.$uma.trackEvent('Um_Event_ClubUpgrade', {
+						Um_Key_ClubName: `${this.name}`,
+						Um_Key_PageName: '普通机构升级入口',
+						Um_Key_SourcePage: '个人中心',
+					})
+				}
+				this.$api.navigateTo(url)
+			},
+			navigatorNex(url){
+				if(!this.hasLogin){
+					this.$api.navigateTo(url)
+				}
 			},		
 			showBadge(n){
 				let num ='';

pages/user/account/account-bean.vue

@@ -10,7 +10,7 @@
 					<view class="m-m title">
 						<text class="m-p">可用数量</text>
 					</view>
-					<text class="iconfont icon-tishi" @click="showAccounExp"></text>
+					<text class="iconfont icon-tishi" @click.stop="this.$api.navigateTo('/pages/service/service?id=1031&title=采美豆说明')"></text>
 				</view>
 			</view>
 			<view class="h-calendar">
@@ -57,10 +57,6 @@
 				<!--加载loadding-->
 			</view>
 		</scroll-view>
-		<view class="showAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
-			<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SAZeZlAA2oDvspRRU204.png" mode=""></image>
-			<text class="iconfont icon-close" @click="hideAccounExp"></text>
-		</view>
 	</view>
 </template>
 <script>
@@ -100,7 +96,6 @@
 				tabCurrentIndex: 0,			//标签选择索引
 				infoData: {selected: []}, 		//日期选择
 				beansList: [],			//余额列表
-				isShowAccounExp:false,		//控制明细说明文字显示
 				isRefreshing:false,
 				isNomore:false,
 				isEmpty:false,
@@ -246,12 +241,6 @@
 					delta: 1
 				});
 			},
-			showAccounExp(){
-				this.isShowAccounExp = true
-			},
-			hideAccounExp(){
-				this.isShowAccounExp = false
-			}
 		},
 		onReachBottom() {
 			if(this.hasNextPage){
@@ -498,51 +487,6 @@ page, .container{
 		}
 	}
 }
-.showAccounExp{
-	width: 100%;
-	height: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	position: fixed;
-	left: 0;
-	top: 100%;
-	opacity: 0;
-	background: rgba(0,0,0,.5);
-	z-index: 999;
-	image{
-		width: 750rpx;
-		height: 1052rpx;
-	}
-	.icon-close{
-		position: absolute;
-		color: #FFFFFF;
-		font-size:60rpx ;
-		bottom: 15%;
-		left: 50%;
-		margin-left: -32rpx;
-
-	}
-}
-.showAccounExp.show{
-	top: 0;
-	opacity: 1;
-	animation:rundtop 0.3s;
-}
-.showAccounExp.hide{
-	top: 100%;
-	opacity: 0;
-	animation:rundbottom 0.3s;
-}
-@keyframes rundtop{
-	0%{top: 100%;opacity: 0;}
-	100%{top:0;opacity: 1;}
-}
-@keyframes rundbottom{
-	0%{top: 0;opacity: 1;}
-	100%{top:100%;opacity: 0;}
-}
 /*空列表显示样式*/
 .empty-account {
 	display: flex;

pages/user/order/create-order.vue

@@ -318,6 +318,14 @@
 				this.isSubLoading = true;	
 				this.OrderService.CreatedOrderSubmit({'params':JSON.stringify(param)}).then(response =>{
 					const data = response.data;
+					// 友盟埋点收集机构自主提交订单
+					if(process.env.NODE_ENV != 'development'){
+						this.$uma.trackEvent('Um_Event_ConfirmOrder', {
+							Um_Key_PageName: '机构提交订单',
+							Um_Key_SourcePage: '确认订单',
+							Um_Key_OrderID:`${data.orderID}`
+						})
+					}
 					if(data.code === '1'){
 						this.submitState ='success'
 						setTimeout(()=>{

pages/user/order/order-pay.vue

@@ -234,6 +234,15 @@
 							orderId:this.orderID
 						}
 					this.PayService.WeChatMiniWxPay(params).then(response =>{
+						// 友盟埋点收集微信支付
+						if(process.env.NODE_ENV != 'development'){
+							this.$uma.trackEvent('Um_Event_ConfirmWechatPay', {
+								Um_Key_PageName: '微信支付',
+								Um_Key_SourcePage: '线上支付',
+								Um_Key_PayName:`${this.buttonText}`,
+								Um_Key_PayOrderID:`${this.orderID}`
+							})
+						}
 						let PayInfo = JSON.parse(response.data.data.payInfo);
 						this.WxRequestPayment(PayInfo)
 					}).catch(error =>{
@@ -321,6 +330,15 @@
 					if (res) {
 						this.isShowTip = false;
 						this.$util.msg("复制成功",2000,true,'success');
+						// 友盟埋点收集复制网银链接
+						if(process.env.NODE_ENV != 'development'){
+							this.$uma.trackEvent('Um_Event_CopyUnionPay', {
+								Um_Key_PageName: '网银支付',
+								Um_Key_SourcePage: '线上支付',
+								Um_Key_PayName:`${this.buttonText}`,
+								Um_Key_PayOrderID:`${this.orderID}`
+							})
+						}
 						setTimeout(()=>{
 							this.$api.navigateTo(`/pages/user/order/order-details?state=0&orderID=${this.orderID}`)
 						},2000)

pages/user/order/order-payment.vue

@@ -265,6 +265,15 @@
 					this.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
 					this.isReceiptStatus = true
 				}else{
+					// 友盟埋点收集选择支付方式
+					if(process.env.NODE_ENV != 'development'){
+						this.$uma.trackEvent('Um_Event_ChooseWechatPay', {
+							Um_Key_PageName: '线上支付',
+							Um_Key_SourcePage: '选择支付',
+							Um_Key_PayName:`${this.buttonText}`,
+							Um_Key_PayOrderID:`${this.orderID}`
+						})
+					}
 					switch(this.tabCurrentIndex){
 						case 0:
 							this.$api.navigateTo(`/pages/user/order/order-pay?type=0&orderID=${this.orderID}`)

pages/user/order/success.vue

@@ -4,7 +4,7 @@
 		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
 			<view class="container-wrapper">
 				<view class="cash-icon">
-					<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/05/%E8%AE%A2%E5%8D%95%E6%94%AF%E4%BB%98%E6%88%90%E5%8A%9F%402x.png" mode=""></image>
+					<image src="https://static.caimei365.com/app/img/icon/icon-success@2x.png" mode=""></image>
 				</view>
 				<view class="cash-text">
 					<text>{{ successText }}</text>
@@ -70,12 +70,12 @@
 			flex-direction: column;
 			align-items: center;
 			.cash-icon{
-				width: 348rpx;
-				height: 348rpx;
+				width: 260rpx;
+				height: 260rpx;
 				margin-top: 120rpx;
 				image{
-					width: 348rpx;
-					height: 348rpx;
+					width: 260rpx;
+					height: 260rpx;
 				}
 			}
 			.cash-text{

search/pages/search/search-instrument.vue

@@ -71,15 +71,7 @@
 		},
 		onLoad(option){
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			if(option.keyWord){
 				this.listQuery.keyword = option.keyWord

search/pages/search/search-supplier.vue

@@ -110,15 +110,7 @@
 		},
 		onLoad(option){
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			if(option.keyWord){
 				console.log(option.keyWord)

search/pages/search/search.vue

@@ -215,15 +215,7 @@
 		onLoad(option) {
 			console.log(option)
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			this.$api.getStorage().then((resolve) =>{
 				this.userId = resolve.userId ? resolve.userId : 0;

second/pages/form/introduce.vue

@@ -79,7 +79,7 @@
 	                 </view>
 	                    <view class="threebuy">此流程适用于10万以下的设备，10万以上二手设备交易请联系高先生。</view>
 	                    <view class="jioayi">具体的流程如下：</view>
-						<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/intro.png" mode="" class="jiaoyi_img"></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-secondimg@2x.png" mode="" class="jiaoyi_img"></image>
 	                </view>
 	            </view>
 	            <view class="second-hand-btn" >

second/pages/product/product-details.vue

@@ -223,15 +223,7 @@
 				this.backPage = option.page
 			}
 			if(this.isShareType =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 		},
 		methods:{
@@ -284,19 +276,6 @@
 			},
 			handleContact(e){//跳转小程序客服
 
-			},
-			navToLogin(){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.$store.commit('setLoginType',8)
-						this.$store.commit('setLoginProductId',this.productID)
-						this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息

second/pages/product/product-list.vue

@@ -155,14 +155,7 @@
 		},
 		onLoad(option) {
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 		},
 		methods:{

seller/pages/club/addoperator.vue

@@ -97,7 +97,7 @@
 			return {
 			  title: '快来成为机构运营人员吧~',
 			  path: `pages/login/bindOperator?userID=${this.userID}`,
-			  imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E5%BF%AB%E6%9D%A5%E6%88%90%E4%B8%BA%E6%9C%BA%E6%9E%84%E8%BF%90%E8%90%A5%E4%BA%BA%E5%91%98%403x.png'
+			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},
 		onShow() {

seller/pages/login/information.vue

@@ -50,9 +50,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck ?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row">

seller/pages/login/login.vue

@@ -95,15 +95,7 @@
 					this.$util.msg('请输入密码',2000)
 					return
 				}
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						this.SellerLogin()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})
+				this.SellerLogin()
 			},
 			SellerLogin(){
 				this.SellerService.SellerLogin(this.params)
@@ -138,15 +130,7 @@
 			},
 		},
 		onShow() {
-			authorize.getSetting().then(res =>{
-				console.log('用户是否授权过',res)
-				if(res == 1){
-					this.getWxAuthorize()
-				}else{
-					console.log(new Date +'用户未授权微信信息')
-					this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				}
-			})
+			this.getWxAuthorize()
 		}
 	}
 </script>

seller/pages/login/register-general.vue

@@ -16,9 +16,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck ?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row">

seller/pages/login/register-member.vue

@@ -150,9 +150,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck ?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row">

seller/pages/login/register.vue

@@ -37,9 +37,9 @@
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
 						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">《机构协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row ">

services/ajax.env.js

@@ -2,10 +2,10 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-	URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	// URL_CONFIG = 'https://core-b.caimei365.com'
+	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
+	URL_CONFIG = 'https://core-b.caimei365.com'
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境

services/user.service.js

@@ -304,7 +304,7 @@ export default class UserService {
 		})
 	}
 	/**
-	 *@获取采美豆状态 删除操作
+	 *@获取采美豆状态 
 	 *@userId userId
 	 */
 	GetHomeObtainBeans (data = {}) {

supplier/pages/login/share-info.vue

@@ -14,7 +14,7 @@
 			return{
 				isRequest:false,
 				invitationCode:'',
-				imagePath:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/06/%E6%97%A0%E6%9D%83%E9%99%90%402x.png',
+				imagePath:'https://static.caimei365.com/app/img/icon/icon-noremb.png',
 				serviceProviderId:'',
 				shopOrderId:null,
 				source:1,
@@ -39,17 +39,7 @@
 					this.source = 3
 				}
 			}
-			authorize.getSetting().then(res =>{
-				console.log('用户是否授权过',res)
-				if(res == 1){
-					this.infoMiniShipments();
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=4')
-					setTimeout(()=>{
-						this.isRequest = true
-					},2000)
-				}
-			})
+			this.infoMiniShipments();
 		},
 		methods:{
 			infoMiniShipments(){
@@ -93,16 +83,8 @@
 			}
 		},
 		onShow() {
-			authorize.getSetting().then(res =>{
-				console.log('用户是否授权过',res)
-				if(res == 1){
-					this.isRequest = false;
-					this.infoMiniShipments();
-				}else{
-					console.log(new Date +'用户未授权微信信息')
-					this.$api.navigateTo('/pages/authorization/authorization')
-				}
-			})
+			this.isRequest = false;
+			this.infoMiniShipments();
 		}
 	}
 </script>
@@ -116,11 +98,11 @@
 		align-items: center;
 		justify-content:center;
 		.share-empty{
-			width: 376rpx;
-			height: 460rpx;
+			width: 352rpx;
+			height: 412rpx;
 			.icon{
-				width: 376rpx;
-				height: 400rpx;
+				width: 352rpx;
+				height: 352rpx;
 				image{
 					width: 100%;
 					height: 100%;

supplier/pages/user/my-shop.vue

@@ -277,15 +277,7 @@
 		},
 		onLoad(option) {
 			if(option.type =='share'){
-				authorize.getSetting().then(res =>{
-					console.log('用户是否授权过',res)
-					if(res == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})
+				wxLogin.wxLoginAuthorize()
 			}
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{