Merge remote-tracking branch 'origin/master'

doum

15 小时以前 b902b40fda2f1dccca0825277d07908119deecfd

 mini-program/pages/details/details.vue

@@ -21,7 +21,9 @@
      </view>
      <view class="content">
         <view class="content-label">商品详情</view>
         <view class="content-val" v-html="info.content"></view>
         <view class="content-val">
            <u-parse :content="info.content"></u-parse>
         </view>
      </view>
      <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 108rpx);"></view>
      <view class="footer">
@@ -50,6 +52,7 @@
         </view>
         <view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
      </view>
      <Login ref="login" />
   </view>
</template>

@@ -80,6 +83,10 @@
      },
      methods: {
         shoucang() {
            if (!this.userInfo) {
               this.$refs.login.open()
               return
            }
            if (this.info.collectStatus === 1) {
               this.$u.api.cancelbatch({ ids: this.info.id })
                  .then(res => {
@@ -97,6 +104,10 @@
            }
         },
         submit() {
            if (!this.userInfo) {
               this.$refs.login.open()
               return
            }
            let shop = [
               {
                  goodsNum: 1,
@@ -109,6 +120,10 @@
            })
         },
         addCard(e) {
            if (!this.userInfo) {
               this.$refs.login.open()
               return
            }
            this.$u.api.addCart({
               goodsId: e.id,
               goodsSkuId: e.skuResponsesList[0].id,
@@ -121,6 +136,10 @@
            })
         },
         toCard() {
            if (!this.userInfo) {
               this.$refs.login.open()
               return
            }
            uni.navigateTo({
               url: '/pages/shopping-cart/shopping-cart'
            })