代码更新

pageCoupon/components/select-goods.vue

@@ -9,19 +9,22 @@
 			<view class="category">
 				<view class="category_item" @tap="itemClick(item,index)" :class="{active:index===category.active}" v-for="(item,index) in category.list" :key="index">{{item.name}}</view>
 			</view>
-			<up-radio-group v-model="goodsValue" @change="groupChange" style="width: 100%;display: initial;">
-				<view class="goodsList">
-					<view class="goodsItem" @tap="goodsClick(item,index)" v-for="(item,index) in category.goodsList" :key="index">
-						<view>{{item.name}}</view>
-						<up-radio
-						  :key="item.id"
-						  :name="item.id"
-						  @change="groupChange"
-						>
-						</up-radio>
+			<view style="flex-shrink: 0;">
+				<up-radio-group v-model="goodsValue" @change="groupChange" style="width: 100%;display: initial;">
+					<view class="goodsList">
+						<view class="goodsItem" @tap="goodsClick(item,index)" v-for="(item,index) in category.goodsList" :key="index">
+							<view>{{item.name}}</view>
+							<up-radio
+							  :key="item.id"
+							  :name="item.id"
+							  @change="groupChange"
+							>
+							</up-radio>
+						</view>
 					</view>
-				</view>
-			</up-radio-group>
+				</up-radio-group>
+			</view>
+		
 		</view>
 		<view class="bomBtn">
 			<view class="affirm" @tap="affirm">确定</view>
@@ -31,10 +34,8 @@
 
 <script setup>
 import { reactive,ref,onMounted } from 'vue';
-import {
-	$tbShopCategory,
-	$tbProductV2
-} from "@/http/yskApi/goods.js"
+import { $tbShopCategory, $tbProductV2 } from "@/http/yskApi/goods.js"
+	import { getProductList, getCategoryList } from '@/api/product.js'
 	const props=defineProps({
 		show:{
 			type:Boolean,
@@ -50,7 +51,7 @@ import {
 			page: 0,
 			size: 999,
 			categoryId: '',
-			sort: "createdAt,desc",
+			orderBy: "create_time desc",
 		}
 	})
 	let goodsValue = ref('');
@@ -67,18 +68,18 @@ import {
 	function groupChange ( n ) {
 		// console.log(n)
 	}
-	function getCategoryList () {
-		$tbShopCategory({
+	function getCategory () {
+		getCategoryList({
 			page:0,size:200
 		}).then(res=>{
-			category.list = res.content;
-			category.query.categoryId = res.content[0].id
+			category.list = res;
+			category.query.categoryId = res[0].id
 			getGoodsList()
 		})
 	}
 	function getGoodsList () {
-		$tbProductV2(category.query).then(res => {
-			category.goodsList = res.content.map(v => {
+		getProductList(category.query).then(res => {
+			category.goodsList = res.records.map(v => {
 				return {
 					...v,
 					isSellNone: false,
@@ -90,7 +91,7 @@ import {
 	}
 	function open(){
 		show.value = true;
-		getCategoryList();
+		getCategory();
 	}
 	
 	function close(){
@@ -140,6 +141,7 @@ import {
 			.category_item{
 				padding: 22rpx 24rpx;
 				border-left: 8rpx solid transparent;
+				 word-wrap: break-word;
 			}
 			.active{
 				border-left: 8rpx solid #318AFE;