YS:问题九秒杀显示不全问题修改

api/activity.js

@@ -24,6 +24,11 @@ export const list = () => {
 		load: false
 	})
 }
+//秒杀商品列表
+export const sharplist = (data) => {
+	console.log(data)
+	return request.get(api.list, data)
+}
 // 秒杀活动首页
 export const data = () => {
 	return request.get(api.data, {}, {

manifest.json

@@ -92,7 +92,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxe843b6d7a4bd3389",
+        "appid" : "wxa3127ed5c3542a28",
         "libVersion" : "latest",
         "setting" : {
             // 是否检查安全域名和 TLS 版本

pages/goods/list.vue

@@ -12,7 +12,7 @@
 				<template v-if="options.categoryId">
 					<view class="goodsban" v-if="tabbar && tabbar.length > 0">
 						<scroll-view class="typeList" scroll-x="true">
-							<view v-for="(item,index) in tabbar" :key="index" class="bandsImg" @click="onChage(item,1)"
+							<view v-for="(item,index) in tabbar" :key="index" class="bandsImg" @click="onChage(item,1,index)"
 								:style="{'color':item.category_id==isBanrdActive?'#F43B21':'#5A5A5A','border':item.category_id==isBanrdActive?'1rpx solid #F22029':'1rpx solid #E7E7E7'}">
 								<image :src="item.image?item.image.external_url:''" mode="aspectFill"></image>
 								<view class="typeItem">{{item.name}}</view>
@@ -329,19 +329,25 @@
 						.then(res => {
 							if (res.data.list.length > 0) {
 								that.tabbar = res.data.list;
-								res.data.list.forEach(item => {
-									item.children.forEach(item_1 => {
-										that.goodsType.push(item_1)
-									})
-								});
-								console.log(that.goodsType, that.tabbar)
+								
+								// res.data.list.forEach(item => {
+								// 	item.children.forEach(item_1 => {
+								// 		that.goodsType.push(item_1)
+								// 	})
+								// });
+								// console.log(that.goodsType, that.tabbar)
 							}
 						})
 						.catch(reject)
 				})
 			},
-			onChage(item, type) {
+			onChage(item, type,index) {
 				if (type == 1) {
+					if(this.tabbar && this.tabbar[index].children && this.tabbar[index].children.length > 0){
+						this.goodsType= this.tabbar[index].children;
+					}
+					this.isActive = '';
+					this.keyName2 = ''
 					if (item.category_id == this.isBanrdActive) {
 						this.isBanrdActive = '';
 						this.keyName1 = ''

pages/news/rules/index.vue

@@ -3,8 +3,7 @@
 		<view class="header">
 			<u-navbar is-back="false" :title="title" ></u-navbar>
 		</view>
-		<view class="content">
-			<rich-text :nodes="strings"></rich-text>
+		<view class="content" v-html="strings">
 		</view>
 	</view>
 </template>

pages/order/detail.vue

@@ -148,7 +148,7 @@
 				v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 			</view>
 			<view class="cancel" @click="onCancel(order.order_id)"
-				v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+				v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.PENDING.value">
 				取消订单
 			</view>
 		</view>
@@ -273,7 +273,7 @@
 					v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
 					删除订单
 				</view>
-				<view class="" v-if="order.pay_status == PayStatusEnum.PENDING.value" @click="onCancel(order.order_id)">
+				<view class="" v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.PENDING.value" @click="onCancel(order.order_id)">
 					取消订单
 				</view>
 			</view>

pages/order/index.vue

@@ -54,15 +54,15 @@
 					<view class="mask" @click="changeMenu(index)">
 					</view>
 					<view class="menulist">
-						<view class="" v-if="item.order_status == OrderStatusEnum.COMPLETED.value"
+						<view class="" v-if="item.order_status == OrderStatusEnum.COMPLETED.value &&item.pay_status == PayStatusEnum.SUCCESS.value"
 							@click="onInvoicing(item.order_id,item)">
 							申请开票
 						</view>
 						<view class="" @click="onDelete(item.order_id)"
-							v-if="item.order_status == OrderStatusEnum.COMPLETED.value">
+							v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value">
 							删除订单
 						</view>
-						<view class="" v-if="item.pay_status == PayStatusEnum.PENDING.value"
+						<view class="" v-if="item.pay_status == PayStatusEnum.PENDING.value && item.order_status == OrderStatusEnum.NORMAL.value"
 							@click="onCancel(item.order_id)">
 							取消订单
 						</view>