小程序更新

components/zs-choose-tab-union/index.vue

@@ -5,7 +5,7 @@
         <view
           class="tab"
           v-for="(item, index) in tabList"
-          :class="[chooseList[index] ? 'active' : '']"
+          :class="[chooseList[index] ? 'active-tab' : '']"
           :key="index"
           @click="handleTab(item, index)"
         >
@@ -17,10 +17,10 @@
             <u-icon
               name="arrow-down"
               size="12px"
-              v-if="active !== index"
+              v-if="active !== index || !show"
             ></u-icon>
             <u-icon
-              v-if="active === index"
+              v-if="active === index && show"
               name="arrow-up"
               size="12px"
             ></u-icon>
@@ -176,10 +176,13 @@ export default {
     display: flex;
     align-items: center;
     padding: 20rpx;
+    width: 100vw;
+    overflow-x: scroll;
     background: #fff;
     .tab {
       display: flex;
       justify-content: center;
+      word-break: keep-all;
       align-items: center;
       background: #f0f0f0;
       border-radius: 8rpx 8rpx 8rpx 8rpx;
@@ -218,13 +221,41 @@ export default {
       background-color: #f2f2f2;
     }
   }
+  .active-tab {
+    color: $uni-color-primary !important;
+    background-color: rgba(246,229,229,.9) !important;
+  }
   .active {
     color: $uni-color-primary !important;
     background-color: #f7f7f7;
+    position: relative;
+    &::before {
+      content: "";
+      position: absolute;
+      top: 18rpx;
+      left: 10rpx;
+      width: 8rpx;
+      height: 35rpx;
+      transform: translateX(-50%);
+      border-radius: 2rpx;
+      background: $uni-color-primary;
+    }
   }
   .activeL2 {
     color: $uni-color-primary !important;
     background-color: #f2f2f2;
+    position: relative;
+    &::before {
+      content: "";
+      position: absolute;
+      top: 18rpx;
+      left: 10rpx;
+      width: 8rpx;
+      height: 35rpx;
+      transform: translateX(-50%);
+      border-radius: 2rpx;
+      background: $uni-color-primary;
+    }
   }
   .activeL3 {
     color: $uni-color-primary !important;

components/zs-tab-bar/index.vue

@@ -10,7 +10,7 @@
       @click="clickBar"
       @change="changBar"
     >
-      <u-tabbar-item text="首页">
+      <u-tabbar-item text="文创">
         <image
           class="u-page__item__slot-icon"
           slot="active-icon"
@@ -82,7 +82,7 @@ export default {
       },
       list: [
         {
-          text: "首页",
+          text: "文创",
           pagePath: "pages/index/index",
         },
         {

my/order/detail.vue

@@ -13,7 +13,7 @@
           ></u-count-down>
         </view>
         <view class="status" v-else>
-          {{ info.goodsList[0].goodsState | filterType }}
+          {{   filterType(info.goodsList[0].goodsState) }}
         </view>
       </view>
     </view>
@@ -122,7 +122,7 @@
       <view class="item">
         <view class="label"> 付款方式 </view>
         <view class="value">
-          {{ info.payment.paymentWay || filterPay || "未支付" }}
+          {{ filterPay(info.payment.paymentWay) || "未支付" }}
         </view>
       </view>
       <view class="item">
@@ -275,6 +275,11 @@ export default {
     // }
   },
   filters: {
+   
+  },
+  computed: {
+  },
+  methods: {
     filterType: function (val) {
       if (val == "APPLY_REFUND") {
         return "退款审核中";
@@ -303,18 +308,6 @@ export default {
         return "-";
       }
     },
-  },
-  computed: {
-    closeTime() {
-      // if((this.info.createTime + 1000*60*15) - new Date().getTime()){
-      // 	this.isNotTime = false
-      // }else{
-      // 	this.isNotTime = true
-      // }
-      return this.info.createTime + 1000 * 60 * 30 - new Date().getTime();
-    },
-  },
-  methods: {
     isRefund() {
       if (!this.info.goodsList[0].verifyModel) {
         //没核销

pages/index/index.vue

@@ -66,7 +66,7 @@
           @change="swiperChange"
           :indicator-dots="false"
           circular
-          :autoplay="false"
+          :autoplay="true"
           :interval="3000"
           :duration="1000"
         >
@@ -106,7 +106,7 @@
                 <view class="goods-price">
                   <view> ￥{{ item.realPrice }} </view>
                   <view class="distance">
-                    销售{{ item.saleNum.toFixed(2) }}
+                    销售{{ item.saleNum }}
                   </view>
                 </view>
               </view>
@@ -170,6 +170,7 @@ export default {
       loading: false,
       navBarHeight: 0,
       statusBarHeight: 0,
+	  
       list: [],
       list1: [],
       status: "more",
@@ -240,6 +241,7 @@ export default {
         getAdv({
           currentPage: 1,
           pageSize: 99,
+		  
           advertsType: 1,
         }).then((res) => {
           if (res.state == "Success") {
@@ -292,7 +294,7 @@ export default {
       //   },
       // });
       uni.navigateTo({
-        url: "./searchResult?column=" + item.columnName,
+        url: `./searchResult?column=${item.columnName}&columnId=${item.goodsCateId}`
       });
       console.log("item", item);
     },

pages/index/searchResult.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="searchResult">
     <!-- <zs-choose-tab :tabList="tabList" @choose="chooseTab"></zs-choose-tab> -->
-    <zs-choose-tab-union :level="2" :tabList="tabList" @choose="chooseTab">
+    <zs-choose-tab-union :level="1" :tabList="tabList" @choose="chooseTab">
     </zs-choose-tab-union>
     <view class="goods-list">
       <zs-list class="store-box" mt="0" @load="loadMore" :status="status">
@@ -25,7 +25,7 @@
               <view class="goods-price">
                 <view> ￥{{ item.realPrice }} </view>
                 <view class="distance">
-                  销售{{ item.saleNum.toFixed(2) }}
+                  销售{{ item.saleNum }}
                 </view>
               </view>
             </view>
@@ -56,7 +56,7 @@
                 ></image> -->
                 <view> ￥{{ item.realPrice }}</view>
                 <view class="distance">
-                  销售{{ item.saleNum.toFixed(2) }}
+                  销售{{ item.saleNum }}
                 </view>
               </view>
             </view>
@@ -80,7 +80,7 @@ export default {
         "location.lat": 0,
         "location.lon": 0,
         range: "",
-        columnName: "",
+        goodsCateId: "",
         goodsName: "",
         shopId: "",
         status: 3,
@@ -106,7 +106,7 @@ export default {
       });
     },
     chooseTab(val) {
-      this.query.goodsName = val[0].cateName;
+      this.query.goodsCateId = val[0].id;
       this.query.pageCurrent = 1;
       this.status = "more";
       this.list = [];
@@ -165,7 +165,7 @@ export default {
     this.query.goodsName = options?.search || "";
 
     if (!this.query.goodsName) {
-      this.query.columnName = options.column;
+      this.query.goodsCateId = options.columnId;
       uni.setNavigationBarTitle({
         title: options.column,
       });
@@ -180,6 +180,7 @@ export default {
 .searchResult {
   padding: 100rpx 24rpx 20rpx;
   background: #f9f9f9;
+  height: 100%;
   .goods-list {
     border-radius: 16rpx 16rpx 0 0;
     margin-bottom: 60rpx;

pages/life/index.vue

@@ -381,7 +381,7 @@
 			// 金刚区
 			getMenu(){
 				return new Promise((resolve,reject)=>{
-					getMenu({currentPage:1,pageSize:10,status:2}).then(res=>{
+					getMenu({belongType: 1,currentPage:1,pageSize:10,status:2}).then(res=>{
 						if(res.state == 'Success'){
 							this.discountsList = res.content.records
 							resolve(1)
@@ -501,16 +501,17 @@
 					.tag {
 						position: absolute;
 						top: -20rpx;
-						left: 50%;
+						left: 0%;
 						background: #FF0615;
 						box-shadow: inset 0rpx 6rpx 12rpx 2rpx rgba(255, 255, 255, 0.16);
-						border-radius: 12rpx 14rpx 14rpx 0rpx;
+						border-radius: 14rpx ;
 						color: #fff;
 						white-space: nowrap;
 						font-size: 18rpx;
 						line-height: -14rpx;
 						height: 24rpx;
 						padding: 0 10rpx;
+						z-index: 1;
 						// width: fit-content;
 						background-size: 100% 34rpx;
 					}