Bug fixed

plugins/step/dare/dare.vue

@@ -203,6 +203,7 @@
                     });
                 } else {
                     uni.showLoading({
+                        mask: true,
                         title: '提交成绩中...'
                     });
                     // #ifdef MP-WEIXIN
@@ -539,8 +540,8 @@
                 this.getList();
             }
         },
-
-        onShareAppMessage: function () {
+        // #ifdef MP
+        onShareAppMessage() {
             return this.$shareAppMessage({
                 title: '步数挑战',
                 path: "/plugins/step/index/index",
@@ -549,7 +550,8 @@
                 }
             });
         },
-        onLoad(options) {
+        // #endif
+        onLoad(options) { this.$commonLoad.onload(options);
             let that = this;
             that.$store.dispatch('user/info');
             if (options.submit == 1) {

plugins/step/detail/detail.vue

@@ -59,6 +59,7 @@
         methods: {
             tabStatus(e) {
                 uni.showLoading({
+                    mask: true,
                     title: '加载中...'
                 });
                 this.list = [];
@@ -111,7 +112,7 @@
             },
         },
 
-        onLoad() {
+        onLoad() { this.$commonLoad.onload();
             let that = this;
             that.$showLoading({
                 type: 'global',

plugins/step/friend/friend.vue

@@ -103,7 +103,7 @@
                 this.getMore();
             }
         },
-        onLoad() {
+        onLoad() { this.$commonLoad.onload();
             let that = this;
             that.$showLoading({
                 type: 'global',

plugins/step/goods/goods.vue

@@ -13,9 +13,9 @@
                 <view v-if="goods.subtitle" class="goods-subtitle">
                     <view class="t-omit-three">{{goods.subtitle}}</view>
                 </view>
-                <view class='price main-between' :class="getTheme+ '-m-text ' + getTheme">
+                <view class='price main-between' :style="{'color': getTheme.color}">
                     <view class="dir-left-nowrap cross-bottom">
-                        <image src='./../image/detail-price.png'></image>
+                        <image class="detail-price" src='./../image/detail-price.png'></image>
                         <view class="cross-bottom">{{goods.min_currency}}</view>
                         <view class="goods-currency" v-if="goods.max_currency > goods.min_currency">起</view>
                         <view>+</view>
@@ -23,9 +23,11 @@
                         <view>{{goods.min_price}}</view>
                         <view class="goods-currency" v-if="goods.max_price > goods.min_price">起</view>
                     </view>
-                    <view class="share" @click="shareClick">
-                        <image src="/static/image/icon/icon-share.png"></image>
-                        <view>分享</view>
+                    <view @click="shareClick"
+                          :style="{'background-color': getTheme.background}"
+                          class="share dir-left-nowrap main-center cross-center">
+                        <image class="share-image box-grow-0" src="/static/image/icon/icon-share-white.png"></image>
+                        <view class="share-text box-grow-0">分享</view>
                     </view>
                 </view>
                 <app-share-qr-code :url="shareUrl"
@@ -33,9 +35,14 @@
                                    :poster-config="poster_config + `&goods_id=` + goods.id"
                                    :poster-generate="poster_generate + `&goods_id=` + goods.id"
                                    v-model="shareShow"
+                                   :goods="goods"
+                                   @share="hShareAppMessage"
                 ></app-share-qr-code>
+				<view style="background-color: #FFFFFF;padding: 24upx; 0 0 24upx">
+					<bd-info-extra :goods="goods" :theme="getTheme" :unit="goods.unit" :min-number="goods.min_number" :limit-buy="goods.limit_buy"></bd-info-extra>
+				</view>
             </view>
-            <bd-coupon  @change="setCoupon" :theme="themeObject" :coupons="goods.goods_coupon_center"></bd-coupon>
+            <bd-coupon  @change="setCoupon" :theme="getTheme" :coupons="goods.goods_coupon_center"></bd-coupon>
             <bd-xbc
                 :coAttr="is_open"
                 :attr-list="selectAttr.attr_list"
@@ -54,7 +61,7 @@
                 :coupon="goods.goods_marketing_award.coupon"
                 :card="goods.goods_marketing_award.card"
                 :balance="goods.goods_marketing_award.balance"
-                :theme="themeObject"
+                :theme="getTheme"
             ></bd-hc>
             <bd-kb
                 :limit="goods.goods_marketing.limit"
@@ -62,35 +69,35 @@
                 :shipping="goods.goods_marketing.shipping"
                 :pickup="goods.goods_marketing.pickup"
             ></bd-kb>
-            <bd-detail :detail="goods.detail" :after_detail="goods.after_detail" :goodsId="goods.id"></bd-detail>
+            <bd-detail :detail="goods.detail"></bd-detail>
             <!--空格区域-->
             <view class="safe-area-inset-bottom u-bottom">
                 <view class="u-bottom-height"></view>
             </view>
             <!--底部按钮-->
             <view v-if="is_open == 1" class="safe-area-inset-bottom u-bottom-fixed">
-                <view class="app-bottom dir-left-nowrap">
-                    <view class="dir-top-nowrap main-center cross-center little box-grow-0" @click="back">
-                        <image src="/static/image/icon/index.png"></image>
-                        <view>首页</view>
+                <view class="bd-bottom dir-left-nowrap cross-center">
+                    <view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="back">
+                        <image class="bd-icon" src="/static/image/icon/index.png"></image>
+                        <text class="bd-text">首页</text>
                     </view>
-                    <view class="dir-left-nowrap">
-                        <view v-if="goods.goods_stock == 0" class="dir-left-nowrap">
-                            <view class="main-center cross-center button" style="background-color: #CDCDCD;color: #fff;">已售罄
-                            </view>
-                        </view>
-                        <view v-else class="main-center cross-center button"
-                              :class="getTheme + '-m-back ' + getTheme"
-                              @click="clickAttr"
-                        >立即兑换
-                        </view>
+                    <bd-service :name="goods.name" :url="webUrl"></bd-service>
+                    <view v-if="goods.goods_stock === 0" class="box-grow-1 bd-btn bd-oversell-btn bd-btn-color" >
+                        已售罄
+                    </view>
+                    <view
+                        v-else
+                        @click="clickAttr"
+                        :style="{'background': goods.buy_goods_auth ? getTheme.background_gradient_btn : '#999999','color': goods.buy_goods_auth ? getTheme.main_text : ''}"
+                        class="bd-btn box-grow-1 bd-btn-color">
+                        立即兑换
                     </view>
                 </view>
             </view>
             <u-attr
                 :goods="goods"
                 v-model="attrShow"
-                :themeObject="themeObject"
+                :theme="getTheme"
                 :checked="selectAttr"
                 :is_show_left="false"
                 rightText="立即兑换"
@@ -118,6 +125,8 @@
     import bdKb from '@/components/page-component/goods/bd-kb.vue';
     import bdHc from '@/components/page-component/goods/bd-hc.vue';
     import appClose from '@/components/basic-component/app-close/app-close.vue';
+    import bdService from '@/components/page-component/goods/bd-service.vue';
+	import bdInfoExtra from '@/components/page-component/goods/bd-info-extra.vue';
 
     export default {
         name: "goods",
@@ -130,36 +139,37 @@
             bdDetail,
             bdHc,
             bdKb,
-            appClose
+            appClose,
+            bdService,
+			bdInfoExtra
         },
         data() {
             return {
                 showClose: false,
                 is_open: 0,
-                goods: null,
+                goods: {
+                    id: '',
+                    name: '',
+                    cover_pic: '',
+                    price: '',
+                },
+                webUrl: '',
                 selectAttr: null,
                 shareShow: false,
                 shareUrl: null,
                 attrShow: false,
                 poster_config: this.$api.step.poster_config,
                 poster_generate: this.$api.step.poster_generate,
+				disable: 'disable'
             };
         },
         computed: {
             ...mapState({
-                mall: state => state.mallConfig.mall
+                mall: state => state.mallConfig.mall,
             }),
             ...mapGetters('mallConfig', {
                 getTheme: 'getTheme',
-            }),
-            themeObject:function() {
-                return {
-                    back: this.getTheme + '-m-back ' + this.getTheme,
-                    theme: this.getTheme,
-                    color: this.getTheme + '-m-text ' + this.getTheme,
-                    sBack: this.getTheme + '-s-back ' + this.getTheme
-                }
-            }
+            })
         },
         onShow() {
             this.showClose = false;
@@ -167,7 +177,8 @@
                 this.showClose = true;
             })
         },
-        onLoad(options) {
+        onLoad(options) { this.$commonLoad.onload(options);
+            this.webUrl = '/plugins/step/goods/goods?goods_id=' + options.goods_id;
             // #ifdef MP-WEIXIN
             wx.showShareMenu({
               menus: ['shareAppMessage', 'shareTimeline']
@@ -175,30 +186,36 @@
             // #endif
             this.loadData(options.goods_id);
         },
-
-        onShareAppMessage: function() {
-            let { app_share_title, name, app_share_pic, cover_pic, id } = this.goods;
-            return this.$shareAppMessage({
-                title: app_share_title ? app_share_title: name,
-                imageUrl: app_share_pic ? app_share_pic: cover_pic,
-                path: "/plugins/step/goods/goods",
-                params: {
-                    goods_id: id
-                }
-            });
-        },
         // #ifdef MP-WEIXIN
         onShareTimeline() {
-            let { app_share_title, name, id } = this.goods;
+            let { app_share_title, name, app_share_pic, cover_pic, id, pic_url } = this.goods;
             return this.$shareTimeline({
                 title: app_share_title ? app_share_title: name,
+                imageUrl: pic_url[0].pic_url,
                 query: {
                     goods_id: id
                 }
             });
         },
         // #endif
+        // #ifdef MP
+        onShareAppMessage() {
+            return this.hShareAppMessage();
+        },
+        // #endif
         methods: {
+            hShareAppMessage(s = false){
+                let { app_share_title, name, app_share_pic, cover_pic, id , subtitle} = this.goods;
+                return this.$shareAppMessage({
+                    title: app_share_title ? app_share_title: name,
+                    imageUrl: app_share_pic ? app_share_pic: cover_pic,
+                    path: "/plugins/step/goods/goods",
+                    desc: subtitle,
+                    params: {
+                        goods_id: id
+                    }
+                }, s);
+            },
             getMall(e) {
                 this.is_open = e.is_open;
             },
@@ -215,6 +232,9 @@
                         this.goods = response.data.detail;
                         this.shareUrl = this.$api.step.goods_poster + '&goods_id=' + id;
                         this.goods.id = id;
+                        // #ifdef H5
+                        this.hShareAppMessage();
+                        // #endif
                     } else {
                         uni.showToast({
                             title: response.msg,
@@ -225,8 +245,8 @@
                     this.$hideLoading();
                 });
             },
-            onAttr(data) {
-                this.selectAttr = data;
+            onAttr({item}) {
+                this.selectAttr = item;
             },
             shareClick() {
                 this.shareShow = true;
@@ -237,36 +257,19 @@
                 });
             },
             clickAttr() {
+				if (!this.goods.buy_goods_auth) {
+                    this.$tips.showToast({
+                        title: '您暂无权限购买该商品',
+                        icon: 'none'
+                    });
+                    return;
+				}
                 this.attrShow = true;
             },
             setCoupon(index) {
                 this.$set(this.goods.goods_coupon_center[index], 'is_receive', 1);
             },
             rightFunc(data) {
-				if (this.$user.isLogin() && this.$store.state.user.info) {
-					let member_level = this.$store.state.user.info.identity.member_level;
-					if (member_level < this.goods.member_level) {
-						uni.showModal({
-							title: "提示",
-							content: "需达到" + this.goods.member_name + "会员才可购买",
-							showCancel: true,
-							confirmText: '升级',
-							success: (res) => {
-								if (res.confirm) {
-									uni.navigateTo({
-										url: '/pages/member/upgrade/upgrade?level=' + member_level + '&other=' + this.goods.member_level
-				
-									})
-								} else if (res.cancel) {
-									console.log('用户点击取消');
-								}
-				
-							}
-						})
-						return;
-					}
-				
-				}
                 uni.navigateTo({
                     url: `/pages/order-submit/order-submit?mch_list=${JSON.stringify([data])}&preview_url=${encodeURIComponent(this.$api.step.order_preview)}&submit_url=${encodeURIComponent(this.$api.step.order_submit)}`
                 });
@@ -299,99 +302,38 @@
         background-color: #ffffff;
         color: #999999;
     }
-
-    .attr {
-        background-color: #f7f7f7;
+    .bd-bottom {
+        width: 750upx;
+        height: 110upx;
+        padding: 20upx 24upx;
     }
-
-    .recommend {
-        .recommend-title {
-            margin: #{40rpx} 0 #{32rpx} 0;
-            font-size: $uni-font-size-weak-one;
-            color: $uni-general-color-two;
-
-            .border {
-                border-top: #{1rpx} solid #bbbbbb;
-                height: 0;
-                width: #{40rpx};
-                margin: 0 #{24rpx};
-            }
-
-            image {
-                width: #{24rpx};
-                height: #{24rpx};
-                display: block;
-                margin-right: #{12rpx};
-            }
-        }
+    .bd-back {
+        width: 66upx;
+        height: 100%;
+        margin-right: 20upx;
     }
-
-    .bottom {
-        width: 100%;
-        height: #{110rpx};
+    .bd-icon {
+        width: 30upx;
+        height: 30upx;
+        margin-bottom: 8upx;
     }
-
-    .app-bottom {
-        width: 100%;
-        height: #{110rpx};
-        font-size: $uni-font-size-general-one;
-
-        .little {
-            width: #{110rpx};
-            height: 100%;
-            background-color: #ffffff;
-            font-size: #{20rpx};
-            color: $uni-general-color-two;
-
-            &:first-child {
-                border-right: #{1rpx} solid #e2e2e2;
-            }
-
-            image {
-                width: #{40rpx};
-                height: #{40rpx};
-                display: block;
-                margin-bottom: #{10rpx};
-            }
-        }
-
-        .button {
-            width: #{650rpx};
-            height: #{110rpx};
-            color: #ffffff;
-        }
-
-        .service {
-            background-color: #446dfd;
-            color: #ffffff;
-        }
-
-        .contact-tel {
-            background-color: #f39800;
-            color: #ffffff;
-        }
-
-        .contact {
-            background-color: #4cbf2a;
-            color: #ffffff;
-        }
+    .bd-text {
+        font-size: 20upx;
+        color: #888888;
+        line-height: 1;
     }
-
-    .comments {
-        margin-bottom: #{20rpx};
-        background-color: #ffffff;
+    .bd-btn {
+        text-align: center;
+        line-height: 70upx;
+        font-size: 28upx;
+        border-radius: 35upx;
     }
-
-    .detail {
-        background-color: #ffffff;
-
-        image {
-            width: 100%;
-            height: #{80rpx};
-            display: block;
-        }
+    .bd-btn-color {
+        color: #ffffff;
+    }
+    .bd-oversell-btn {
+        background-color: #CDCDCD;
     }
-
     .price {
         height: #{106rpx};
         font-size: #{40rpx};
@@ -402,7 +344,7 @@
         position: relative;
     }
 
-    .price image {
+    .price .detail-price {
         height: #{44rpx};
         width: #{44rpx};
         display: block;
@@ -411,15 +353,20 @@
     }
 
     .share {
-        margin-right: #{20rpx};
         margin-top: #{10rpx};
-        font-size: $uni-font-size-weak-two;
-        color: $uni-general-color-one;
+        height: #{48rpx};
+        border-radius: #{40rpx} 0 0 #{40rpx};
+        padding: 0 #{14rpx};
+        width: #{103rpx};
 
-        image {
-            width: #{40rpx};
-            height: #{40rpx};
-            margin-bottom: #{10rpx};
+        .share-image {
+            width: #{22rpx};
+            height: #{22rpx};
+        }
+        .share-text {
+            font-size: #{22rpx};
+            color: #ffffff;
+            margin-left: #{10rpx};
         }
     }
 

plugins/step/index/index.vue

@@ -38,7 +38,7 @@
                 <view>助力</view>
             </view>
             <view class='friend-list'>
-                <view style="display: inline-block" v-for="item in invite_list" :key="item" @click="showHiddenClick">
+                <view style="display: inline-block" v-for="(item, index) in invite_list" :key="index" @click="showHiddenClick">
                     <image load-lazy='true' :src='item.avatar'></image>
                 </view>
                 <view class='look-more'>
@@ -75,7 +75,7 @@
         </view>
         <view v-if="banner_list.length" class='banner' indicator-dots="true" autoplay="true">
             <swiper class="swiper" indicator-dots="true" autoplay="true">
-                <swiper-item v-for="item in banner_list" :key="item">
+                <swiper-item v-for="(item, index) in banner_list" :key="index">
                     <app-jump-button :open_type="item.open_type" :url="item.page_url" :params="item.params">
                         <image mode="aspectFill" :src="item.pic_url"></image>
                     </app-jump-button>
@@ -139,7 +139,7 @@
             <text>免费兑换</text>
         </view>
         <view class='good-list dir-left-wrap'>
-            <view class='good-item' v-for="good in goods" :key="good" @click="toGoods(good)">
+            <view class='good-item' v-for="(good,  index) in goods" :key="index" @click="toGoods(good)">
                 <view class="out-dialog" v-if="good.count_stock == 0 && appSetting.is_show_stock == '1'">
                     <image :src="appSetting.is_use_stock == '1' ? appImg.plugins_out : appSetting.sell_out_pic"></image>
                 </view>
@@ -151,7 +151,7 @@
                     <!-- #ifndef MP-ALIPAY -->
                     <view class='good-name t-omit-two'>{{good.name}}</view>
                     <!-- #endif -->
-                    <view :class="getTheme + '-m-text ' + getTheme" class='good-price dir-left-nowrap cross-center'>
+                    <view :style="{'color': getTheme.color}" class='good-price dir-left-nowrap cross-center'>
                         <image load-lazy='true' src='./../image/detail-price.png'></image>
                         <view class="cross-bottom">{{good.min_currency}}</view>
                         <view v-if="good.max_currency > good.min_currency"  style="align-self: flex-end;font-size: #{22rpx};padding-bottom:#{2rpx};">起</view>
@@ -163,7 +163,7 @@
                         <view>￥{{good.original_price}}</view>
                         <view>仅剩{{good.count_stock}}件</view>
                     </view>
-                    <button v-if="good.count_stock > 0" :class="getTheme + '-m-back ' + getTheme" class="good-exchange">立即兑换</button>
+                    <button v-if="good.count_stock > 0" :style="{'background': good.buy_goods_auth ? getTheme.background_gradient_btn : '#999999','color': good.buy_goods_auth ? getTheme.main_text : ''}" class="good-exchange">立即兑换</button>
                     <button v-else class="good-exchange" style="background: #CDCDCD;color: #fff;">已售罄</button>
                 </view>
             </view>
@@ -185,14 +185,14 @@
                 <view class="app-icons dir-left-nowrap">
                     <view class="box-grow-1" @click="showHiddenClick">
                         <app-jump-button form arrangement="topCenter" open_type="share">
-                            <icon class="app-icon app-share"></icon>
+                            <icon class="app-icon app-share" type></icon>
                             <text class="app-text">发送给朋友</text>
                         </app-jump-button>
                     </view>
                     <view class="box-grow-1">
                         <app-form-id @click="toShare(user_data.daily_num)">
                             <view class="dir-top-wrap main-center cross-center">
-                                <icon class="app-icon app-code"></icon>
+                                <icon class="app-icon app-code" type></icon>
                                 <text class="app-text">生成邀请海报</text>
                             </view>
                         </app-form-id>
@@ -203,6 +203,7 @@
                         <view style="height: 100rpx;background-color: #ffffff;text-align: center;line-height: 100rpx;font-size: 32rpx;color: #353535;" @click="showHiddenClick"  type="general">取消</view>
                     </app-form-id>
                 </view>
+
                 <view v-if="getBoolEmpty.XBoolean" :style="{height: getBoolEmpty.emptyHeight + 'rpx',}"></view>
             </view>
         </view>
@@ -249,6 +250,7 @@
                     }
                 ],
                 coupon_url: this.$api.step.receive,
+				disable: 'disable'
             }
         },
         components: {
@@ -260,11 +262,17 @@
                 appImg: state => state.mallConfig.__wxapp_img.mall,
                 appSetting: state => state.mallConfig.mall.setting,
                 userInfo: state => state.user.info,
+                platform: function(state) {
+                    return state.gConfig.systemInfo.platform;
+                }
             }),
              ...mapGetters('mallConfig', {
                 getVideo: 'getVideo',
                 getTheme: 'getTheme'
-             }),
+             }), 
+            ...mapGetters('iPhoneX', {
+                getBoolEmpty: 'getBoolEmpty'
+            })
         },
         filters: {
             getObje(data, temp) {
@@ -337,7 +345,7 @@
             },
 
             toGoods(data) {
-                 // #ifndef MP-BAIDU
+                 // #ifndef MP-BAIDU || H5
                 if (data.video_url && this.getVideo == 1) {
                     uni.navigateTo({
                         url: `/pages/goods/video?goods_id=${data.goods_id}&sign=step`
@@ -348,7 +356,11 @@
                     });
                 }
                 // #endif
-
+                // #ifdef H5
+                uni.navigateTo({
+                    url: '/plugins/step/goods/goods?goods_id=' + data.goods_id
+                });
+                // #endif
                 // #ifdef MP-BAIDU
                 uni.navigateTo({
                     url: '/plugins/step/goods/goods?goods_id=' + data.id
@@ -704,6 +716,7 @@
                 let today = year + "-" + month + "-" + now;
                 // #endif
                 uni.showLoading({
+                    mask: true,
                     title: '兑换中...'
                 });
                 uni.login({
@@ -774,14 +787,13 @@
         },
         // #ifdef MP-WEIXIN
         onShareTimeline() {
-          // 分享朋友圈beta
           return this.$shareTimeline({
             title: this.share_title ? this.share_title : this.$children[0].navigationBarTitle,
             query: {} // 此处填写页面的参数
           });
         },
         // #endif
-        onLoad(options) {
+        onLoad(options) { this.$commonLoad.onload(options);
             let that = this;
             // #ifdef MP-WEIXIN
             wx.showShareMenu({
@@ -868,7 +880,8 @@
                 // #endif
             }
         },
-        onShareAppMessage: function() {
+        // #ifdef MP
+        onShareAppMessage() {
             return this.$shareAppMessage({
                 title: this.share_title ? this.share_title : this.$children[0].navigationBarTitle,
                 imageUrl: this.setting.share_pic ? this.setting.share_pic : '',
@@ -878,6 +891,7 @@
                 }
             });
         }
+        // #endif
     }
 </script>
 

plugins/step/join/join.vue

@@ -134,6 +134,7 @@
                 let that = this;
                 let id = that.list.id;
                 uni.showLoading({
+                    mask: true,
                     title: '报名中...'
                 });
                 that.$request({
@@ -167,7 +168,7 @@
             },
         },
 
-        onLoad(options) {
+        onLoad(options) { this.$commonLoad.onload(options);
             let that = this;
             that.getList(options.id);
         }

plugins/step/log/log.vue

@@ -99,7 +99,7 @@
             },
         },
 
-        onLoad(options) {
+        onLoad(options) { this.$commonLoad.onload(options);
             let that = this;
             that.time = new Date().getTime();
             that.getList();

plugins/step/share/share.vue

@@ -81,6 +81,7 @@
                 let that = this;
                 // #ifndef MP-ALIPAY
                 uni.showLoading({
+                    mask: true,
                     text: '保存中...'
                 });
                 uni.authorize({
@@ -166,6 +167,7 @@
             getPoster() {
                 let that = this;
                 uni.showLoading({
+                    mask: true,
                     title: '生成中...'
                 });
                 that.$request({
@@ -224,7 +226,7 @@
             },
         },
 
-        onLoad(options) {
+        onLoad(options) { this.$commonLoad.onload(options);
             let that = this;
             if (options.step > -1) {
                 that.todayStep = options.step

plugins/step/top/top.vue

@@ -106,6 +106,7 @@
             change(num) {
                 let that = this;
                 uni.showLoading({
+                    mask: true,
                     text: '加载中...'
                 });
                 that.list = [];
@@ -179,7 +180,7 @@
             },
         },
 
-        onLoad() {
+        onLoad() { this.$commonLoad.onload();
             let that = this;
             let url = that.$api.step.step_convert;
             that._num = 1;