Merge branch 'master' into ls

ghsApp/src/admin/home/workbench.vue

@@ -38,8 +38,8 @@
 	<!-- #endif -->
     <view style="width:100vw;height:250upx;display:flex;align-items:center;justify-content:center;position:relative;margin-bottom:170upx;">
 		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">批发店登录</button>
-		<text style="color:green;position:absolute;top:260upx;font-size:40upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
-		<text style="color:green;position:absolute;top:380upx;font-size:40upx;text-decoration: underline;" @click.stop="toPhone()">联系官方客服</text>
+		<text style="color:green;position:absolute;top:300upx;font-size:42upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
+		<text style="color:green;position:absolute;top:420upx;font-size:42upx;text-decoration: underline;" @click.stop="toPhone()">联系官方</text>
     </view>
 
   </block>
@@ -396,7 +396,15 @@ export default {
 			this.val = total
 		},
 		toPhone(){
-			uni.makePhoneCall({ phoneNumber:'15280215347' })
+			let that = this
+			that.$util.confirmModal({content:'请添加官方客服微信',okText:'复制微信'},() => {
+				uni.setClipboardData({
+					data: '15280215347',
+					success: function() {
+						that.$msg("复制成功")
+					}
+				})
+			})
 		},
 		closeRenew(){
 			this.$refs.renewRef.close()

ghsApp/src/pagesClient/official/apply.vue

@@ -2,8 +2,11 @@
   <div class="app-content">
     <form @submit="formSubmit">
       <view class="module-com">
-        <view style="font-weight:bold;color:red;padding:20upx 0 20upx 35upx;font-size:32upx;text-align:center;">批发店请添加管理员微信
-          <text style="color:#3385FF;text-decoration: underline;" @click="suggest">15280215347</text> 获取邀请码，没有邀请码不能注册。零售花店请勿注册，请勿联系。</view>
+        <view style="font-weight:bold;color:red;padding:20upx 20upx 20upx 20upx;font-size:34upx;text-align:center;">
+          批发店请添加管理员微信
+          <text style="color:#3385FF;text-decoration: underline;margin-left:5upx;margin-right:5upx;" @click="suggest">15280215347</text>
+          获取邀请码，没有邀请码不能注册。零售花店请勿注册，请勿联系。
+        </view>
       </view>
       <view class="module-com">
         <tui-list-cell class="line-cell" :hover="false" >