From 7b535f1d4560403d7adb5e08c89d7eeb387926a3 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Fri, 2 Jul 2021 23:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=95=86=E6=88=B7=E7=89=88=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A7=92=E6=9D=80=E9=99=90=E8=B4=AD=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/t-goods-item/t-goods-item.vue |   2 +-
 pages/activity/GoodsSeckill/index2.vue   | 278 -----------------------
 pages/activity/SeckillDetails/index.vue  |  11 +-
 pages/shop/news/NewsDetail/index.vue     |   2 +-
 4 files changed, 12 insertions(+), 281 deletions(-)
 delete mode 100644 pages/activity/GoodsSeckill/index2.vue

diff --git a/components/t-goods-item/t-goods-item.vue b/components/t-goods-item/t-goods-item.vue
index 033e062..ac3be38 100644
--- a/components/t-goods-item/t-goods-item.vue
+++ b/components/t-goods-item/t-goods-item.vue
@@ -26,7 +26,7 @@
           <view class="grab bg-color-red" v-if="timeList[active].status === 1 && item.stock > 0" @click="goDetail">马上抢</view>
           <view class="grab" v-if="timeList[active].status === 1 && item.stock <= 0">已售磬</view>
           <view class="grab bg-color-red" v-if="timeList[active].status === 2">即将开始</view>
-          <view class="grab bg-color-red" v-if="timeList[active].status === 0">已结束</view>
+          <view class="grab bg-color-red" v-if="timeList[active].status === 0" >已结束</view>
         </view>
       </view>
     </view>
diff --git a/pages/activity/GoodsSeckill/index2.vue b/pages/activity/GoodsSeckill/index2.vue
deleted file mode 100644
index 017d0d0..0000000
--- a/pages/activity/GoodsSeckill/index2.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-  <view class="flash-sale" ref="container">
-    <view class="header" v-if="headerImg">
-      <image :src="headerImg" />
-    </view>
-    <scroll-view scroll-y="false" scroll-x="true">
-      <view class="timeScroll">
-        <div class="logoPic">
-          <image src="https://wx.yixiang.co/h5/img/baokuan.6313c8c8.png"></image>
-        </div>
-        <view v-for="(item, index) in timeList" :key="index">
-          <view v-if="active == index" class="timeItem active" @click="setTime(index)">
-            <view class="time">{{ item.time }}</view>
-            <view class="state">{{ item.state }}</view>
-          </view>
-          <view v-if="active != index" class="timeItem" @click="setTime(index)">
-            <view class="time">{{ item.time }}</view>
-            <view class="state">{{ item.state }}</view>
-          </view>
-        </view>
-      </view>
-    </scroll-view>
-    <view v-for="(item, index) in timeList" :key="index">
-      <view v-if="active == index">
-        <!-- <view class="countDown font-color-red acea-row row-center-wrapper">
-          <view v-if="item.status === 0" class="activity">活动已结束</view>
-          <count-down :isDay="false" :tipText="'距结束仅剩 '" :dayText="false" :hourText="' : '" :minuteText="' : '"
-            :secondText="false" :datatime="datatime" v-if="item.status === 1"></count-down>
-          <view v-if="item.status === 2" class="activity">活动即将开始</view>
-        </view> -->
-        <view class="list">
-          <view class="item acea-row row-between-wrapper" v-for="(itemSeckill, indexSeckill) in seckillList" :key="indexSeckill">
-            <view class="pictrue">
-              <image :src="itemSeckill.image" />
-            </view>
-            <view class="text acea-row row-column-around">
-              <view class="line1" v-text="itemSeckill.title"></view>
-              <view class="money">
-                限时价
-                <text class="num font-color-red">￥{{ itemSeckill.price || '' }}</text>
-              </view>
-              <view class="progress cart-color">
-                <view class="bg-red" :style="{ width: loading ? itemSeckill.percent + '%' : '' }"></view>
-                <view class="piece font-color-red" v-text="'仅剩' + itemSeckill.stock + '件'"></view>
-              </view>
-            </view>
-            <view class="grab bg-color-red" v-if="item.status === 1 && itemSeckill.stock > 0" @click="goDetail(itemSeckill.id, item.status)">马上抢</view>
-            <view class="grab" v-if="item.status === 1 && itemSeckill.stock <= 0">已售磬</view>
-            <view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
-            <view class="grab bg-color-red" v-if="item.status === 0">已结束</view>
-            <!-- <view class="grab bg-color-red" @click="goDetail(itemSeckill.id,item.status)" v-if="item.status === 2">即将开始</view> -->
-            <!-- <view class="grab bg-color-red" @click="goDetail(itemSeckill.id,item.status)" v-if="item.status === 0">已结束</view> -->
-          </view>
-        </view>
-        <view class="noCommodity" style="background-color: #f5f5f5;" v-if="seckillList.length === 0 && page > 1">
-          <view class="noPictrue">
-            <image :src="`${$VUE_APP_RESOURCES_URL}/images/noGood.png`" class="image" />
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-<script>
-import { getSeckillConfig, getSeckillList } from '@/api/activity'
-import CountDown from '@/components/CountDown'
-// import { Tab, Tabs } from "vant-weapp";
-import Loading from '@/components/Loading'
-
-export default {
-  name: 'GoodsSeckill',
-  components: {
-    CountDown,
-  },
-  props: {},
-  data: function() {
-    return {
-      headerImg: '',
-      timeList: [],
-      sticky: false,
-      loading: false,
-      datatime: 0,
-      active: 0,
-      seckillList: [],
-      status: false, //砍价列表是否获取完成 false 未完成 true 完成
-      loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-      page: 1, //页码
-      limit: 5, //数量
-      title: [],
-    }
-  },
-  mounted: function() {
-    this.mountedStart()
-  },
-  onReachBottom() {
-    !this.loadingList && this.getSeckillList()
-  },
-  methods: {
-    changeTime: function(index) {
-      this.active = index
-      this.getSeckillList()
-    },
-    mountedStart: function() {
-      var that = this
-      uni.showLoading()
-      getSeckillConfig().then(res => {
-        that.$set(that, 'headerImg', res.data.lovely)
-        that.$set(that, 'timeList', res.data.seckillTime)
-        that.$set(that, 'active', res.data.seckillTimeIndex)
-
-        let title = []
-        title = res.data.seckillTime.map((item, index) => {
-          return {
-            name: 'div',
-            attrs: {
-              class: 'timeItem',
-            },
-            children: [
-              {
-                name: 'div',
-                attrs: {
-                  class: 'time',
-                },
-                children: [
-                  {
-                    type: 'text',
-                    text: item.time,
-                  },
-                ],
-              },
-              {
-                name: 'div',
-                attrs: {
-                  class: 'state',
-                },
-                children: [
-                  {
-                    type: 'text',
-                    text: item.state,
-                  },
-                ],
-              },
-            ],
-          }
-        })
-        that.$set(that, 'title', title)
-        that.datatime = that.timeList[that.active].stop
-        that.getSeckillList()
-        that.$nextTick(function() {
-          that.sticky = true
-          uni.hideLoading()
-        })
-      })
-    },
-    setTime: function(index) {
-      var that = this
-      that.page = 1
-      that.loadingList = false
-      that.status = false
-      that.active = index
-      that.datatime = that.timeList[that.active].stop
-      this.seckillList = []
-      that.getSeckillList()
-    },
-    getSeckillList: function() {
-      var that = this
-      if (that.loadingList) return
-      if (that.status) return
-      var time = that.timeList[that.active].id
-      getSeckillList(time, {
-        page: that.page,
-        limit: that.limit,
-      }).then(res => {
-        that.status = res.data.length < that.limit
-        that.seckillList.push.apply(that.seckillList, res.data)
-        that.page++
-        uni.hideLoading()
-      })
-    },
-    goDetail: function(id, status) {
-      var that = this
-      var time = that.timeList[that.active].stop
-      this.$yrouter.push({
-        path: '/pages/activity/SeckillDetails/index',
-        query: {
-          id,
-          time,
-          status,
-        },
-      })
-    },
-  },
-}
-</script>
-<style scoped lang="less">
-.flash-sale {
-  background: #f5f5f5 !important;
-  height: 100%;
-}
-
-.timeScroll {
-  display: flex;
-  align-items: center;
-  flex-direction: row;
-}
-
-.list {
-  padding: 0 20rpx;
-
-  .item {
-    padding: 0.25 * 100rpx;
-    border-bottom: 1px solid #f0f0f0;
-    height: auto;
-    position: relative;
-    background: #fff;
-    margin-bottom: 0.2 * 100rpx;
-    border-radius: 0.2 * 100rpx;
-  }
-}
-
-.logoPic {
-  width: 75rpx;
-  height: 70rpx;
-  margin-left: 20rpx;
-  margin-right: 20rpx;
-
-  image {
-    width: 75rpx;
-    height: 70rpx;
-  }
-}
-
-.timeItem {
-  font-size: 0.22 * 100rpx;
-  color: #282828;
-  width: 150rpx;
-  text-align: center;
-  padding: 20rpx 0;
-  background-color: none;
-
-  &.active {
-    .time {
-      color: #eb3729;
-    }
-
-    .state {
-      background: linear-gradient(90deg, #00c17b, #00c17b);
-      color: #fff;
-      opacity: 1;
-      border-radius: 30rpx;
-      padding: 0 0.2 * 100rpx;
-      font-weight: 800;
-      height: 0.37 * 100rpx;
-      line-height: 0.37 * 100rpx;
-    }
-  }
-}
-
-.timeItem .time {
-  font-size: 0.32 * 100rpx;
-  font-weight: bold;
-  height: 0.5 * 100rpx;
-  line-height: 0.5 * 100rpx;
-}
-
-.timeItem .state {
-  height: 0.37 * 100rpx;
-  line-height: 0.37 * 100rpx;
-}
-
-.activity {
-  color: #333;
-}
-
-.flash-sale .list .item .grab {
-  background-color: #999;
-}
-</style>
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index 8eba8d4..df7533b 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -74,6 +74,7 @@
         </view>
       </view>
 
+      
       <view class="tui-operation-right tui-right-flex tui-col-7 tui-btnbox-4" v-if="seckillStatus == 1 && storeInfo.num > 0 && storeInfo.stock > 0">
         <view class="tui-flex-1">
           <tui-button height="68rpx" :size="26" type="warning" shape="circle" @click="openAlone">单独购买</tui-button>
@@ -340,7 +341,15 @@ export default {
       let stock = productSelect.stock || 0
       let num = this.attr.productSelect
       if (changeValue) {
-        num.cart_num++
+        if (num) num.cart_num++
+        if (num.cart_num > this.storeInfo.num) {
+          num.cart_num = this.storeInfo.num
+          uni.showToast({
+            title: '限购' + this.storeInfo.num,
+            icon: 'none',
+            duration: 2000,
+          })
+        }
         if (num.cart_num > stock) {
           this.$set(this.attr.productSelect, 'cart_num', stock)
           this.$set(this, 'cartNum', stock)
diff --git a/pages/shop/news/NewsDetail/index.vue b/pages/shop/news/NewsDetail/index.vue
index 520e7cb..adb5683 100644
--- a/pages/shop/news/NewsDetail/index.vue
+++ b/pages/shop/news/NewsDetail/index.vue
@@ -114,7 +114,7 @@ export default {
       let that = this,
         id = this.$yroute.query.id
       getArticleDetails(id).then(res => {
-        res.data.content = res.data.content.replace(/\<img/gi, '<img style="width:100%;height:auto;"')
+        res.data.content = res.data.content.replace(/\<img/gi, '<img style="max-width:100% !important; height:auto"')
         that.articleInfo = res.data
         console.log(that.articleInfo)
         that.updateTitle()