Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/mixins/list.js

@@ -2,10 +2,10 @@ export default {
   watch: {
     'list.loading'(val) {
       if (val) {
-        uni.showLoading({
-          title: '加载中...',
-          mask: true,
-        })
+        // uni.showLoading({
+        //   title: '加载中...',
+        //   mask: true,
+        // })
       } else {
         uni.hideLoading()
       }

hdApp/src/admin/home/me.vue

@@ -135,7 +135,6 @@
       :selectItemId.sync="shopId"
       @selectSussess="selectSussess"
     ></DorpdownSelect>
-    <kd-entrance></kd-entrance>
   </view>
 </template>
 

mallApp/src/pages/pay/index.vue

@@ -153,7 +153,7 @@
 				getOrderShop(true).then(res => {
 					this.inpFocus = true
 					uni.setNavigationBarTitle({
-						title: `您正在向【${res.shop.merchantName} ${res.shop.shopName}】付款`
+						title: `您正在向【${res.shop.showName}】付款`
 					})
 
 					this.$refs.couponSel._getUserDiscount().then(status => {
@@ -164,13 +164,8 @@
 					let shareParams = {
 						title: `点我付款`, // 分享标题
 						desc: '享随机优惠，最高20元', // 分享内容
-						imgUrl: `${this.$constant.imgUrl}/retail/pay.jpg`,
-						// #ifdef H5
-						pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.shop.id}&store=0&sourceType=3`,
-						// #endif
-						// #ifndef H5
+						imgUrl: '',
 						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&sourceType=3`
-						// #endif
 					}
                     // #ifdef MP-WEIXIN
 					this.jweixinFn(shareParams)