Merge branch 'master' into ls

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="model" v-if="show">
+  <view class="model" v-if="hasNoShop">
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <view style="margin:45upx 0;color:white;font-size:35upx;">首次下单，请填写门店信息</view>
     <view class="freeApply" @click="apply">填写</view>
@@ -9,17 +9,18 @@
     <view style="margin:55upx 0;color:white;font-size:29upx;" >如您的伙伴需要买花，请联系批发店添加员工</view>
   </view>
   <block v-else>
-    <view class="model-pass" v-if="pass == false">
+    <view class="model-pass" v-if="check == false">
       <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
       <view style="margin:80upx 0;color:white;font-size:34upx;">审核中</view>
       <view class="freeApply" @click="refresh">刷新</view>
+      <view style="margin:80upx 0 0 0;text-decoration:underline;color:white;font-size:34upx;" @click="contactShop()">联系商家</view>
     </view>
   </block>
 </template>
 <script>
 export default {
   props: {
-    show: {
+    notOpenShop: {
       type: Boolean,
       default: true,
     },
@@ -37,13 +38,31 @@ export default {
     }
   },
   watch: {
+    notOpenShop:{
+        handler(bool){
+          this.hasNoShop = bool == true ? true : false
+        },
+        immediate:true,
+    },
+    pass:{
+        handler(bool){
+          this.check = bool == true ? true : false
+        },
+        immediate:true,
+    },
   },
   data() {
     return {
       constant: this.$constant,
-      experCode: ''
+      experCode: '',
+      hasNoShop:true,
+      check:true
     };
   },
+  mounted(){
+    this.hasNoShop = this.notOpenShop == true ? true : false
+    this.check = this.pass == true ? true : false
+  },
   methods: {
     learnCg(){
         this.$util.pageTo({url: '/admin/jc/video',query:{url:'cg.mp4'}})
@@ -57,6 +76,9 @@ export default {
     rightClick() {
       this.$emit('comfirm', this.experCode)
     },
+    contactShop(){
+      this.$emit('contactShop')
+    },
     goLogin(){
       let that = this
       that.$util.confirmModal({content:'如您的伙伴和员工也需要登录，请联系批发店添加员工',okText:'知道了'},() => {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -128,7 +128,7 @@
 		</modal-module>
 
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" @showCartItem="showCartItem"></FooterCart>
-		<wangCg :show.sync="notOpenShop" :pass.sync="pass" @bthClick="goToCg()" @refresh="toRefresh"></wangCg>
+		<wangCg :notOpenShop.sync="notOpenShop" :pass.sync="pass" @bthClick="goToCg()" @refresh="toRefresh" @contactShop="contactShop()"></wangCg>
     	<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
 		<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
 
@@ -260,7 +260,7 @@ export default {
 				smallCount: 0
 			},
 			showSubmitModel: false,
-			notOpenShop:false,
+			notOpenShop:true,
 			pass:true,
 			hdShopAdminId:0,
 			fromGhsId:0,
@@ -322,6 +322,13 @@ export default {
 			this.init()
 		}
 
+		if(this.$util.isEmpty(this.loginInfo)){
+			this.notOpenShop = true
+		}else{
+			this.hdShopAdminId = this.loginInfo.shopAdminId
+			this.notOpenShop = false
+		}
+
 		if(this.xjData.hasUpdate == 1){
 
 			this.customData = this.hasColorInfo
@@ -508,6 +515,28 @@ export default {
 		toRefresh(){
 			this.init()
 		},
+		contactShop(){
+			let ghs = this.ghsInfo
+			let mobileList = []
+			if (!this.$util.isEmpty(ghs.telephone)){
+				mobileList.push(ghs.telephone)
+			}
+			if (!this.$util.isEmpty(ghs.telephone2)){
+				mobileList.push(ghs.telephone2)
+			}
+			if(this.$util.isEmpty(mobileList)){
+				this.$msg('没有联系电话')
+				return false
+			}
+			uni.showActionSheet({
+				itemList: mobileList,
+				success: function (respond) {
+					let currentIndex = respond.tapIndex
+					let mobile = mobileList[currentIndex]
+          			uni.makePhoneCall({ phoneNumber: mobile })
+				}
+			})
+		},
 		init(){
 
 			//通过供货商小程序分享进采购页，注册的客户，注册后引导返回采购页

hdApp/src/pagesPurchase/readMe.vue

@@ -514,6 +514,9 @@
 			<view>
 				<view class="info">
 				到货后，请参照实际发货的截图账单，进行验收点货，拍开箱视频，以备售后使用。
+                </view>
+				<view class="title">
+				下单10分钟内可申请取消订单，10分钟后不支持取消！
                 </view>
 				<view class="info">
 				请在12小时内投诉，超过时间一概不予售后！