Merge remote-tracking branch 'origin/master'

# Conflicts:
#	assets/http/config.js
#	pages/activity/activityDetail.vue

assets/http/config.js

@@ -4,7 +4,7 @@ let config = {}
 config.baseURL='https://vote.guosen-fumao.cn/api'
 //是否需要获取手机号
 config.isAuthPhone=true
-
+config.transformDomains = 'https://m.changyoyo.com'
 //普通二维码跳作品详情链接
 config.PRODUCT_PATH='https://vote.guosen-fumao.cn/home',
 

components/alert/pointAuth.vue

@@ -19,7 +19,8 @@
 							</view>
 						</view>
 					</view>
-					<u-button @click="toAuth" :custom-style="customStyle" shape="circle">去授权</u-button>
+					<u-button v-if="!isCopy" @click="toAuth" :custom-style="customStyle" shape="circle">点击复制授权链接</u-button>
+					<u-button  v-else :disabled="true" :custom-style="disableStyle"  shape="circle">已复制请用浏览器打开</u-button>
 				</image>
 			</view>
 		</u-popup>
@@ -32,6 +33,7 @@
 		data() {
 			return {
 				show: false,
+				isCopy: false,
 				popupStyle: {
 					'u-mode-center-box': 'red'
 				},
@@ -41,6 +43,10 @@
 					background: "#E72226",
 					width: '400rpx',
 					margin: '25rpx auto'
+				},
+				disableStyle: {
+					width: '400rpx',
+					margin: '25rpx auto'
 				}
 			};
 		},
@@ -49,20 +55,30 @@
 			showAuth(url) {
 				this.authUrl = url;
 				this.show = true;
+				this.isCopy = false;
 			},
 			hide() {
 				this.show = false;
 			},
 			close() {
-				console.log("close");
 				this.$emit('close')
 			},
 			toAuth() {
-				let params = {
-					url: encodeURIComponent(this.authUrl),
-					title: '移动积分授权'
-				}
-				this.$jump('/pages/webview/webview' + this.$u.queryParams(params));
+				uni.setClipboardData({
+				    data: this.authUrl,
+					showToast: false,
+				    success: ()=> {
+				        this.isCopy =true;
+				    }
+				});
+				// console.log(this.authUrl);
+				// this.authUrl = this.authUrl.replace(this.$config.transformDomains,this.$config.baseURL+'/phoneAuth');
+				// let params = {
+				// 	url: encodeURIComponent(this.authUrl),
+				// 	title: '移动积分授权'
+				// }
+				// console.log(this.authUrl);
+				// this.$jump('/pages/webview/webview' + this.$u.queryParams(params));
 			}
 		}
 	}

components/alert/votePopup.vue

@@ -37,7 +37,7 @@
 				</view>
 			</view>
 		</u-popup>
-		<point-auth ref="pointAuth" @close="pointAuthClose"></point-auth>
+		<point-auth ref="pointAuth" ></point-auth>
 		<loading ref="loading" type="3" />
 	</view>
 </template>
@@ -77,6 +77,7 @@
 					const queryRes = (await this.$api.CMCC.queryCmccPoint(this.$u.queryParams(params)));
 					if (queryRes.data.data.resultCode == '0001') {
 						this.$refs.pointAuth.showAuth(queryRes.data.data.data);
+						this.$refs.loading.hide()
 						return;
 					}
 					const pointDetail = JSON.parse(queryRes.data.data.data);

pages/activity/activityDetail.vue

@@ -96,9 +96,9 @@
 			return {
 				//是否自定义返回，防止授权时返回到webview页面
 				isCustomBack:true,
-				
+
 				defaultAvatar:'https://vote.guosen-fumao.cn/obsfile/446d9e043f3748e4a47ea4d0de81b140-3b748fea4150c469b8eb66f98cd29e2.png',
-				
+
 				loading: false,
 				//作品id
 				id: '',
@@ -280,7 +280,7 @@
 				if (res.data.success) {
 					this.$refs.votePopup.hideVote()
 					this.fetchData()
-					
+
 					let avatar=this.$cache.get('userInfo').avatar
 					let voteCount=this.selectGoods.votePointRate
 					let pointNum=this.vuex_active_setting.voteAndPointRate

pages/shop/shop.vue

@@ -70,7 +70,7 @@
 		data() {
 			return {
 				swiperList: [
-					'https://gx.vote.activity.obs.cn-south-1.myhuaweicloud.com:443/3b23192e2b684e1e8d606790216d9d19-bff40cda56a61fb3151002945d87ad7.jpg'
+					'https://vote.guosen-fumao.cn/obsfile/3b23192e2b684e1e8d606790216d9d19-bff40cda56a61fb3151002945d87ad7.jpg'
 				],
 				downOption: {
 					auto: false

uni_modules/mescroll-uni/components/mescroll-diy/xinlang/mescroll-uni-option.js

@@ -19,7 +19,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "https://gx.vote.activity.obs.cn-south-1.myhuaweicloud.com:443/2603aec6466f4b5fb7010df377b0c680-%E6%97%A0%E6%95%B0%E6%8D%AE.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "https://vote.guosen-fumao.cn/obsfile/2603aec6466f4b5fb7010df377b0c680-%E6%97%A0%E6%95%B0%E6%8D%AE.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 		}
 	},
 	// 国际化配置

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js

@@ -20,7 +20,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "https://gx.vote.activity.obs.cn-south-1.myhuaweicloud.com:443/2603aec6466f4b5fb7010df377b0c680-%E6%97%A0%E6%95%B0%E6%8D%AE.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "https://vote.guosen-fumao.cn/obsfile/2603aec6466f4b5fb7010df377b0c680-%E6%97%A0%E6%95%B0%E6%8D%AE.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 		}
 	},
 	// 国际化配置