修改bug

修改首页页面

App.vue

@@ -36,7 +36,7 @@ export default {
 		font-size: 28rpx;
 		color: $fontMain;
 		background: #F5F6F8;
-
+    overflow-x: hidden;
 		view {
 			display: block;
 			flex-direction: row;

pages.json

@@ -25,8 +25,10 @@
 				"navigationBarTitleText": "首页",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
+				"disableScrollToObject": 1,
 				"app-plus": {
-					"bounce": "none"
+					"bounce": "none",
+					"popGesture": "none"
 				}
 			}
 		},

pages/home/index.vue

@@ -1,14 +1,14 @@
 <template>
   <view class="ps-wrapper">
     <view id="headerBox" ref="headerBox" :class="[mpCommonClass]" :style="{
-        background: `url(${bgImg}) no-repeat center top`,
+        // background: `url(${bgImg}) no-repeat center top`,
         backgroundSize: '100% 400rpx',
-        marginTop:`${statusBarHeight}px`,
-        backgroundColor: '#F7F7F7',
+        paddingTop: `${navbarHeight+topData.height}px`,
+        backgroundColor: '#D6E1D0',
       }" class="header-box">
       <view>
-        <view :height=" '1225rpx'" class="banner-container">
-          <u-swiper :autoplay="true" :current="current" :height=" '1225rpx'" :list="bannerList" circular
+        <view :height="'1080rpx'" class="banner-container">
+          <u-swiper :autoplay="true" :current="current" :height="'1080rpx'" :list="bannerList" circular
                     duration="1000" interval="5000" @change="(data) => (current = data.current)" @click="bannerClick">
             <template #indicator>
               <view class="custom-indicator">
@@ -17,34 +17,36 @@
               </view>
             </template>
           </u-swiper>
-          <view class="logo-search-container" :style="{top:`${navbarHeight}px`,left:'0rpx'}">
-            <view class="centered-image">
+          <view class="logo-search-container" :style="{top:0,left:'0rpx',paddingBottom:'20rpx',height:navbarHeight+topData.height+10+'px'}">
+            <view class="centered-image" :style="{
+                  marginTop:`${navbarHeight}px`
+            }">
               <van-image
                   :src="logoImg"
                   fit="contain"
-                  height="20px"
+                  :height="topData.height"
                   width="83px"
               />
             </view>
             <view :style="{
-                width: '75%',
-                height: '100%',
+                width: '50%',
+                height:topData.height+'px',
+                marginTop:`${navbarHeight}px`
              }" class="search-box" @click="toSearchList">
               <u-icon name="search" size="20"></u-icon>
               <text>请输入关键词</text>
             </view>
           </view>
         </view>
-        <view style="background-color: #FFFFFF;margin-top: 16rpx;">
-          <view >
-            <u-notice-bar @click="handleAdv"  :text="advList.map((a) => a.remark)"></u-notice-bar>
+        <view style="background-color: #FFFFFF;">
+          <view>
+            <u-notice-bar @click="handleAdv" color="#EE7945" :text="advList.map((a) => a.remark)"></u-notice-bar>
           </view>
         </view>
 
-
         <!-- 商品分类 -->
-        <view class="goods-list">
-          <view class="goods-list-item" @click="jumpPage('haowu')">
+        <view class="box-list">
+          <view class="box-list-item" @click="jumpPage('haowu')">
             <van-image
                 height="136rpx"
                 src="/static/hd1.png"
@@ -52,7 +54,7 @@
             />
             <view style=" margin-top: 14rpx">芳香好物</view>
           </view>
-          <view class="goods-list-item" @click="jumpPage('xueyuan')">
+          <view class="box-list-item" @click="jumpPage('xueyuan')">
             <van-image
                 height="136rpx"
                 src="/static/hd2.png"
@@ -61,7 +63,7 @@
             <view style=" margin-top: 14rpx"> 芳香学院</view>
           </view>
 
-          <view class="goods-list-item" @click="jumpPage('huodong')">
+          <view class="box-list-item" @click="jumpPage('huodong')">
             <van-image
                 height="136rpx"
                 src="/static/hd3.png"
@@ -70,7 +72,7 @@
             <view style=" margin-top: 14rpx"> 芳香活动</view>
           </view>
 
-          <view class="goods-list-item" @click="jumpPage('shenghuo')">
+          <view class="box-list-item" @click="jumpPage('shenghuo')">
             <van-image
                 height="136rpx"
                 src="/static/hd5.png"
@@ -80,7 +82,7 @@
             </view>
           </view>
 
-          <view class="goods-list-item" @click="jumpPage('peiban')">
+          <view class="box-list-item" @click="jumpPage('peiban')">
             <van-image
                 height="136rpx"
                 src="/static/hd4.png"
@@ -90,91 +92,88 @@
             <view style=" margin-top: 14rpx">陪伴营</view>
           </view>
         </view>
-        <view class="biaoti">
-          <van-image
-              height="85.94rpx"
-              src="/static/biaoti1.png"
-              width="171.3rpx"
-          />
-        </view>
+
         <view class="content-box">
-          <view v-for="(item, index) in activityList" :key="index"  :style="{width: '95%',borderRadius:'24rpx', margin: '0rpx auto', height: '378rpx' ,borderRadius: '24rpx 24rpx 24rpx 24rpx',backgroundColor: '#F2FAF2'}"
-                @click="toHuodong(item)">
-            <van-image
-                height="280rpx"
-                :src="item.pic"
-                width="100%"
-            />
-            <view >
-              <van-row>
-                <van-col span="16">
-                  <view class="huodongText">
-                    {{ item.name }}
-                  </view>
-                </van-col>
-                <van-col span="8">
-                  <van-row>
-                    <van-col span="12">
-                      <view class="huodongText2">
-                        <van-image
-                            class="huodongText2-img"
-                            height="28rpx"
-                            src="/static/hdlist2.png" width="28rpx"
-                        />
-                        {{item.hits }}
-                      </view>
-                    </van-col>
-                    <van-col span="12">
-                      <view class="huodongText2">
-                        <van-image
-                            class="huodongText2-img"
-                            height="28rpx"
-                            src="/static/hdlist3.png" width="28rpx"
-                        />
-                        {{item.entry_num }}
-                      </view>
-                    </van-col>
-                  </van-row>
-                </van-col>
-              </van-row>
+          <view class="activity-list">
+            <view class="biaoti" style="background: linear-gradient( 180deg, #C4D1BB 0%, #F7F9F6 84%);">
+              <van-image
+                  height="85.94rpx"
+                  src="/static/biaoti1.png"
+                  width="171.3rpx"
+              />
             </view>
-          </view>
-          <view class="biaoti">
-            <van-image
-                height="85.94rpx"
-                src="/static/biaoti2.png"
-                width="171.3rpx"
-            />
-          </view>
-          <view
-              :style="{width: '95%', margin: '0rpx auto'}">
-            <view style="width: 100%;">
-
-              <view v-for="(item, index) in goods_class" :key="index">
-                <view style="margin-bottom: 24rpx" @click="toKecheng(item)">
-                  <van-image
-                      :src="item.cover"
-                      height="200rpx"
-                      width="100%"
-                  />
+            <image src="/static/huodong-icon.png" mode="aspectFill" class="biaoti-icon"></image>
+            <view v-for="(item, index) in activityList" :key="index"
+                  @click="toHuodong(item)" class="activity-item">
+              <van-image
+                  height="670rpx"
+                  :src="item.pic"
+                  width="750rpx"
+              />
+              <view class="activity-init display-flex-between ">
+                <view class="display-flex-content-center">
+                  <view class="huodongText2">
+                    <van-image
+                        class="huodongText2-img"
+                        height="28rpx"
+                        src="/static/hdlist2.png" width="28rpx"
+                    />
+                    {{ item.hits }}
+                  </view>
+                  <view class="huodongText2">
+                    <van-image
+                        class="huodongText2-img"
+                        height="28rpx"
+                        src="/static/hdlist3.png" width="28rpx"
+                    />
+                    {{ item.entry_num }}
+                  </view>
+                </view>
+                <view class="activity-btn display-flex-content-center" @click.stop="handleRegister(item)">
+                  立即报名
                 </view>
               </view>
             </view>
           </view>
-          <view class="biaoti">
-            <van-image
-                height="85.94rpx"
-                src="/static/biaoti3.png"
-                width="171.3rpx"
-            />
+
+          <view class="course-list">
+            <view class="biaoti">
+              <van-image
+                  height="85.94rpx"
+                  src="/static/biaoti2.png"
+                  width="171.3rpx"
+              />
+            </view>
+            <image src="/static/kecheng-icon.png" mode="aspectFill" class="biaoti-icon">
+            </image>
+            <view v-for="(item, index) in goods_class" :key="index" class="course-item" v-if="index < 2">
+              <view style="margin-bottom: 24rpx" @click="toKecheng(item)">
+                <van-image
+                    :src="item.cover"
+                    height="208rpx"
+                    width="100%"
+                />
+              </view>
+            </view>
           </view>
-          <view
-              :style="{width: '95%', margin: '0rpx auto'}">
-            <CommercePart :data="commonDataList"></CommercePart>
-            <!-- 赠品专区 -->
-            <image v-if="giftBanner.pic" :src="giftBanner.pic" mode="aspectFill"
-                   style="width: 100%; height: 206rpx" @click="toSubpages('giftZone')">
+          <view  class="goods-list">
+            <view class="biaoti">
+              <van-image
+                  height="85.94rpx"
+                  src="/static/biaoti3.png"
+                  width="171.3rpx"
+              />
+            </view>
+            <image src="/static/shangpin-icon.png" style="width: 250rpx;height: 250rpx;right:  -43px;" mode="aspectFill" class="biaoti-icon">
             </image>
+            <view
+                :style="{width: '690rpx', margin: '0rpx auto'}">
+              <CommercePart :data="commonDataList"></CommercePart>
+              <!-- 赠品专区 -->
+              <image v-if="giftBanner.pic" :src="giftBanner.pic" mode="aspectFill"
+                     style="width: 100%; height: 206rpx" @click="toSubpages('giftZone')">
+              </image>
+            </view>
           </view>
         </view>
       </view>
@@ -267,25 +266,18 @@ export default {
       advList: [],
       goods_class: [],
       sourceBanner: [],
-      activityList:[]
+      activityList: []
     };
   },
   computed: {
-    // 导航栏内部盒子的样式
-    navbarInnerStyle() {
-      let style = {};
-      // 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
-      style.height = this.navbarHeight + "px";
-      // // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
-      // #ifdef MP
-      let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
-      style.marginRight = rightButtonWidth + "px";
-      // #endif
-      return style;
-    },
     // 转换字符数值为真正的数值
     navbarHeight() {
-      return    this.topData.top -systemInfo.statusBarHeight+1
+      console.log( uni.getMenuButtonBoundingClientRect())
+      console.log(    uni.getSystemInfoSync().statusBarHeight)
+      console.log(this.topData)
+      console.log(systemInfo.statusBarHeight)
+      console.log("+++++++++++++++++++++++++++++++=")
+      return this.topData.top
     },
     token() {
       return this.$U.getStorage("token");
@@ -309,7 +301,7 @@ export default {
     this.getBanner();
     this.getNewsList();
     this.getActivityList();
-    this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight-1; // 状态栏高度
+    this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight - 1; // 状态栏高度
     // uni
     //     .createSelectorQuery()
     //     .in(this)
@@ -402,29 +394,26 @@ export default {
         uni.navigateTo({
           url: '/pages/productCenter/productCenter',
         })
-      } else if( type === "xueyuan"){
+      } else if (type === "xueyuan") {
         uni.navigateTo({url: `/subPages/course/course`,})
-      } else if( type === "huodong"){
+      } else if (type === "huodong") {
         uni.switchTab({
-              url: '/pages/activity/activity',
-         })
-      }else if (type === "peiban"){
+          url: '/pages/activity/activity',
+        })
+      } else if (type === "peiban") {
         uni.navigateTo({url: `/subPages/accompanyingCamp/accompanyingCamp`,})
-      }else if (type === "shenghuo"){
+      } else if (type === "shenghuo") {
         uni.navigateTo({url: `/subPages/fragrantLife/fragrantLife`,})
-      }
-
-
-      else {
+      } else {
         Toast('敬请期待');
       }
     },
 
     toHuodong(item) {
-      uni.navigateTo({url: `/subPages/activityDetail/activityDetail?activityId=${ item.id}`,})
+      uni.navigateTo({url: `/subPages/activityDetail/activityDetail?activityId=${item.id}`,})
     },
     toKecheng(item) {
-      uni.navigateTo({url: `/subPages/courseDetail/courseDetail?goods_code=${ item.code}`,})
+      uni.navigateTo({url: `/subPages/courseDetail/courseDetail?goods_code=${item.code}`,})
     },
     bannerClick(index) {
       const currentUrl = this.sourceBanner[index].pic_url
@@ -465,7 +454,7 @@ export default {
         this.bannerList = slider.map(item => item.pic);
         this.sourceBanner = slider
         this.goodsList = goods_cate;
-        this.commonDataList = goods_online;
+        this.commonDataList = goods_online.slice(0, 4);;
         this.msGoodsList = seckill_goods;
         this.goods_class = goods_class;
         this.ponitsBanner = integral_page.length && integral_page[0];
@@ -496,8 +485,8 @@ export default {
       });
     },
     getActivityList() {
-      getActivityList({ page: 1, pageSize: 1}).then(({ data }) => {
-        this.activityList =data.list
+      getActivityList({page: 1, pageSize: 1}).then(({data}) => {
+        this.activityList = data.list
       });
     },
     getMsData() {
@@ -615,7 +604,10 @@ export default {
         url: `/pages/productCenter/productCenter?cateid=${item.id}`,
       });
     },
-    handleAdv(index=0) {
+    handleRegister(item2) {
+      uni.navigateTo({url: `/subPages/activityDetail/activitySave?activityId=${item2.id}`,})
+    },
+    handleAdv(index = 0) {
       const activeAdv = this.advList[index];
       console.log("index==>", index)
       console.log("advList==>", this.advList)
@@ -626,10 +618,15 @@ export default {
   },
 };
 </script>
-
+w
 <style lang="scss" scoped>
+page {
+  overflow-x: hidden;
+}
 .ps-wrapper {
-  background-color: $primary-bg-color;
+  //background-color: $primary-bg-color;
+  background-color:   #C4D1BB;
+  overflow: hidden;
   .adv-box {
     position: relative;
     // padding: 0 33rpx 20rpx;
@@ -689,8 +686,87 @@ export default {
   .content-box {
     // overflow-y: auto;
     background-color: $primary-bg-color;
-    padding: 20rpx 0 0;
+    overflow: hidden;
+    .activity-list{
+      width: 750rpx;
+      border-radius: 0;
+      position: relative;
+      overflow: hidden;
+      .activity-item{
+        width: 750rpx;
+        height: 750rpx;
+        background-color: #E1E3D5;
+        opacity: 0.8;
+        .activity-init {
+          width: 750rpx;
+          height: 80rpx;
+
+          .huodongText2-img {
+            margin-right: 30rpx;
+            margin-left: 30rpx;
+            display: flex; // 添加 flex 布局
+            align-items: center; // 垂直居中
+          }
+
+          .huodongText2 {
+            height: 80rpx;
+            display: flex; // 添加 flex 布局
+            align-items: center; // 垂直居中
+            font-weight: 350;
+            font-size: 24rpx;
+            color: #4C644A;
+            line-height: 34rpx;
+            text-align: left;
+            font-style: normal;
+            text-transform: none;
+          }
 
+          .activity-btn {
+            width: 144rpx;
+            height: 48rpx;
+            border-radius: 0rpx 0rpx 0rpx 0rpx;
+            border: 1rpx solid #4C644A;
+            font-weight: 350;
+            font-size: 22rpx;
+            color: #4C644A;
+            line-height: 32rpx;
+            text-align: left;
+            font-style: normal;
+            text-transform: none;
+            margin-right: 20rpx;
+          }
+        }
+      }
+    }
+    .biaoti-icon{
+      width: 200rpx;
+      height: 200rpx;
+      position: absolute;
+      top: 0;
+      right: -22px;
+    }
+    .course-list {
+      width: 750rpx;
+      background: linear-gradient(180deg, #C4D1BB 0%, #F7F9F6 31%);
+      border-radius: 0;
+      padding-bottom: 22rpx;
+      position: relative;
+      .course-item {
+        width: 690rpx;
+        height: 208rpx;
+        margin-bottom: 28rpx;
+        padding: 0 30rpx;
+      }
+      overflow: hidden;
+    }
+    .goods-list{
+      width: 750rpx;
+      background: linear-gradient( 180deg, #C4D1BB 0%, #F7F9F6 31%);
+      border-radius: 0;
+      padding-bottom: 22rpx;
+      position: relative;
+      overflow: hidden;
+    }
     .part-box {
       background: linear-gradient(180deg, #fdd118 0%, #f7f7f7 100%);
       border-radius: 10rpx 10rpx 10rpx 10rpx;
@@ -723,13 +799,14 @@ export default {
       width: 100%;
 
       .logo-search-container {
-        position: absolute;
-        width: 77%;
+        position: fixed;
+        width: 100%;
         display: flex;
-        justify-content: space-between;
         align-items: center;
         padding: 0 20rpx;
         box-sizing: border-box;
+        z-index: 9999;
+        background-color: rgba(214, 225, 208,1);
         .search-box {
           margin: 0rpx 20rpx 0rpx 20rpx;
           height: 61rpx;
@@ -739,10 +816,8 @@ export default {
           display: flex;
           align-items: center;
           flex-direction: row;
-
           text {
             font-size: 24rpx;
-            font-family: PingFang SC-Regular, PingFang SC;
             font-weight: 400;
             color: #9D9D9D;
             line-height: 61rpx;
@@ -750,7 +825,6 @@ export default {
           }
         }
       }
-
       .centered-image {
         display: flex;
         justify-content: center;
@@ -782,20 +856,24 @@ export default {
     }
   }
 
-
-  .goods-list {
+  .box-list {
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-start;
-    background-color: #FFFFFF;;
-    padding: 0 20rpx;
-    padding-top: 40rpx;
-
+    width: calc(750rpx - 40rpx);
+    height: 292rpx;
+    background: linear-gradient(180deg, #C4D1BB 0%, #F7F9F6 44%);
+    border-radius: 0rpx 0rpx 0rpx 0rpx;
+    //background-color: #FFFFFF;;
+    padding: 0 20rpx 0;
     &-item {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
       width: 20%;
       flex-shrink: 0;
       text-align: center;
-      margin-bottom: 30rpx;
       color: #1d161f;
       font-size: 26rpx;
     }
@@ -803,45 +881,12 @@ export default {
 
   .biaoti {
     width: 100%;
-    height: 180rpx;
+    height: 186rpx;
     display: flex;
     justify-content: center;
     align-items: center
   }
 
-  .huodongText {
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 400;
-    font-size: 26rpx;
-    color: #333333;
-    line-height: 36rpx; // 修正拼写错误
-    text-align: left; // 如果需要水平居中，可以改为 'center'
-    font-style: normal;
-    text-transform: none;
-    height: 98rpx;
-    display: flex; // 添加 flex 布局
-    align-items: center; // 垂直居中
-    margin-left: 30rpx; // 添加左边距
-  }
-
-  .huodongText2 {
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 400;
-    font-size: 20rpx;
-    color: #666666;
-    height: 98rpx;
-    line-height: 28rpx;
-    text-align: left;
-    font-style: normal;
-    display: flex; // 添加 flex 布局
-    align-items: center; // 垂直居中
-    text-transform: none;
-
-    .huodongText2-img {
-      margin-right: 15rpx;
-      margin-left: 15rpx
-    }
-  }
 
 }
 </style>

pages/mine/index.vue

@@ -290,7 +290,7 @@ export default {
         // {
         //   name: "线下消费记录",
         //   url: require("@/static/ic-other-i.png"),
-        //   path: "/subPages/storeConsumption/storeConsumption?orderNo=SP2025051517460011",
+        //   path: "/subPages/storeConsumption/storeConsumption?orderNo=SP20250526251999",
         //   isVip: true
         // },
         {

pages/productCenter/productCenter.vue

@@ -194,7 +194,7 @@
         let configs = uni.getStorageSync('configs') || {}
         this.bgImg = configs.shop_bgimg
         configs.btn_color = configs.btn_color || '#C79C53'
-        getGoodCate({mark:"线上商品"}).then(({
+        getGoodCate({goods_kind:"线上商品"}).then(({
                               data = []
                             }) => {
           // 只取前五个

pages/shoppingCart/shoppingCart.vue

@@ -16,8 +16,8 @@
             <view class="display-flex-between">
               <text class="fw400 color-888  fs12 mb8">￥<text class="fw700 color-333  fs16 mb8">{{item.sku.price_selling}}</text></text>
               <u-number-box min="1" :name="item.id"
-                            :max=" item.goods_type == 'goods' ? item.sku.stock_total : 1" v-model="item.num"
-                            @change="numChange" button-size="24">
+                            :max=" item.goods_type == 'goods' ? (item.sku.stock_total - item.sku.stock_sales): 1" v-model="item.num"
+                            @change="numChange" button-size="24" >
                 <view
                     slot="minus"
                     class="minus"

subPages/activityDetail/activityDetail.vue

@@ -229,7 +229,10 @@ export default {
     },
     handleRegister() {
       if (this.is_entry){
-        Toast.fail('您已报名，请勿重复报名');
+        uni.showToast({
+          title: '您已报名，请勿重复报名!',
+          icon: 'none'
+        })
         return
       }
       uni.navigateTo({url: `/subPages/activityDetail/activitySave?activityId=${ this.activityId}`,})
@@ -249,7 +252,7 @@ export default {
         this.activityInfo.start_time = (new Date(this.activityInfo.start_time.replace(' ', 'T'))).toISOString().slice(0, 16).replace('T', ' ');
         this.activityInfo.end_time = (new Date(this.activityInfo.end_time.replace(' ', 'T'))).toISOString().slice(0, 16).replace('T', ' ');
         this.activityInfo.entry_end = entryEnd.toISOString().slice(0, 16).replace('T', ' ');
-        if (data.entry_info != []&&data.entry_info.id &&!( data.entry_info.status==0|| data.entry_info.status==-1)) {
+        if (data.entry_info &&data.entry_info[data.entry_info.length-1]&&data.entry_info[data.entry_info.length-1].id &&!( data.entry_info[data.entry_info.length-1].status==0|| data.entry_info[data.entry_info.length-1].status==-1)) {
           this.is_entry=true
         }
         if (data.entry_num&&data.entry_num>0){
@@ -327,11 +330,13 @@ export default {
       return newVar
     },
     toJump( index) {
-      if(index==1){
+      if(index===1){
         uni.switchTab({
           url:'/pages/home/index'
         });
-      }else if(index==2){
+      }else if(index===2){
+
+        console.log('toJump',this.activityInfo)
         if (!this.is_entry){
           Toast.fail('你暂未报名,无法查询报名信息！');
           return

subPages/activityDetail/activitySave.vue

@@ -44,7 +44,7 @@
       />
       <van-cell title="报名人数" >
         <template #default>
-          <van-stepper  v-model="formData.num" :disabled="is_entry"  @change="onChangeStepper"/>
+          <van-stepper  v-model="formData.num" :max="activityInfo.entry_max>0?activityInfo.entry_max-activityInfo.entry_num:50" :disabled="is_entry"  @change="onChangeStepper"/>
         </template>
       </van-cell>
       <van-cell title="报名时间"  v-if="is_entry" :value="MyActivityInfo.created_at"/>

subPages/afterSales/afterSales.vue

@@ -130,10 +130,10 @@
 					 uni.$u.toast("请输入申请说明");
 					 return
 				}
-				if(!this.fileList1.length) {
-					uni.$u.toast("请上传照片凭证");
-					return
-				}
+				// if(!this.fileList1.length) {
+				// 	uni.$u.toast("请上传照片凭证");
+				// 	return
+				// }
 				let sendData = {
 					order_no: this.pageOptions.orderNo,
 					refund_img: this.fileList1.map(item => item.url),

subPages/goodsDetail/goodsDetail.vue

@@ -64,7 +64,7 @@
             <text class="mr10 color-777 fs14">运费</text>
             <text class="color-333 fs14">￥{{ truckData.firstAmt || 0 }}</text>
           </view>
-          <view class="color-777 fs14">已售 {{ detailData.stock_sales + detailData.stock_virtual }} | 剩余 {{ detailData.stock_total }}</view>
+          <view class="color-777 fs14">已售 {{ detailData.stock_sales + detailData.stock_virtual }} | 剩余 {{ (detailData.stock_total - detailData.stock_sales)}}</view>
         </view>
         <u-divider></u-divider>
         <view @click="suitHandler" class=" display-flex-between display-flex-center">
@@ -254,6 +254,10 @@
             </view>
           </view>
         </template>
+        <view class="mb30" >
+          <view class="fw700 mb20">数量</view>
+          <u-number-box :min="1" integer v-model="suitNum"   :max="(detailData.stock_total - detailData.stock_sales)"></u-number-box>
+        </view>
         <view class="common-btn" @click="submit">提交</view>
       </view>
     </u-popup>

subPages/myOrder/orderItem.vue

@@ -25,7 +25,7 @@
 			</view>
 			<view class="display-flex-center">
 				<text class="btn-gray-border" @click.stop="cancelOrder"
-					v-if="[1, 2, 3].includes(data.status) && !isRefund">取消订单</text>
+					v-if="([1, 2, 3].includes(data.status) && !isRefund )|| (isRefund && [-2, -1].includes(data.refund_status))">取消订单</text>
 				<text class="common-btn ml10" @click.stop="toPay" v-if="[1, 2].includes(data.status)">立即付款</text>
 				<text class="btn-gray-border ml10" @click.stop="confirm" v-if="[4].includes(data.status)">确认收货</text>
 				<text class="btn-gray-border ml10" v-if="[6, 9].includes(data.status) && !isRefund"

subPages/settleCenter/settleCenter.vue

@@ -422,6 +422,14 @@ export default {
      */
     handleItem(item) {
       this.showCoupon = false
+
+      if (Number(item.coupon_price) > Number(this.orderData.amount_goods)) {
+        uni.showToast({
+          title: '无法使用该优惠券!',
+          icon: 'none'
+        })
+        return;
+      }
       if (item.coupon_id == this.checkedCoupon.coupon_id) {
         this.checkedCoupon = {id: 0, coupon_id: 0}
       } else {

subPages/storeConsumption/storeConsumption.vue

@@ -219,13 +219,13 @@ export default {
     <u-popup :show="show" :round="10" :closeable="true" mode="center" @close="close" @open="open">
       <view class="payment-popup">
         <view class="payment-popup-title  display-flex-content-center mt20">请输入安全密码</view>
-        <view class=" display-flex-content-center mt20">
+        <view class=" display-flex-content-center mt20 mb20">
           <text class=" fs12 fw400">￥
             <text class="fw700 fs20">{{ detailData.amount_discount }}</text>
           </text>
         </view>
-        <view class=" display-flex-content-center mt30">
-          <u-code-input ref="codeInputRef" @finish="finish" v-model="pwd" :maxlength="6" mode="box"  dot :focus="true"></u-code-input>
+        <view class=" display-flex-content-center ">
+          <u-code-input ref="codeInputRef" @finish="finish" v-model="pwd"  size="65rpx" :maxlength="6" mode="box"  dot :focus="true"></u-code-input>
         </view>
         <view class="forgot-password  display-flex-content-center mt20" @click="forgotPwd">未设置/忘记密码？</view>
       </view>