From 0361e5cd94893d3b4cf6e7dce2d584251ef67369 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 21 Apr 2022 18:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                               |  8 +++----
 pages/index/components/Pick.vue             | 20 ++++++++---------
 pages/order/detail/components/Operation.vue | 24 ++++++++++-----------
 pages/order/list.vue                        |  6 +++---
 pages/order/submit.vue                      |  3 ++-
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/manifest.json b/manifest.json
index e8f4a65..38e4241 100644
--- a/manifest.json
+++ b/manifest.json
@@ -77,16 +77,16 @@
         "devServer" : {
             "proxy" : {
                 "/uc/" : {
-                    "target" : "http://192.168.10.109:8090/"
+                    "target" : "http://192.168.10.5:8090/"
                 },
                 "/mall/" : {
-                    "target" : "http://192.168.10.109:8090/"
+                    "target" : "http://192.168.10.5:8090/"
                 },
                 "/pay/" : {
-                    "target" : "http://192.168.10.109:8090/"
+                    "target" : "http://192.168.10.5:8090/"
                 },
                 "/oss/" : {
-                    "target" : "http://192.168.10.109:8090/"
+                    "target" : "http://192.168.10.5:8090/"
                 }
             }
         }
diff --git a/pages/index/components/Pick.vue b/pages/index/components/Pick.vue
index b9530e9..a0eb638 100644
--- a/pages/index/components/Pick.vue
+++ b/pages/index/components/Pick.vue
@@ -2,44 +2,44 @@
  * @Author: ch
  * @Date: 2022-03-23 10:29:07
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 16:23:22
+ * @LastEditTime: 2022-04-21 18:36:57
  * @Description: file content
 -->
 <template>
 	<view class="pick">
 		<view class="max" @click="$Router.push(`/goodsDetail?id=${max.id}`)">
-			<view class="title">{{max.name}}</view>
-			<view class="desc">{{max.name}}</view>
+			<view class="title">{{max.title}}</view>
+			<view class="desc">{{max.subTitle}}</view>
 			<!-- <view class="tag"></view> -->
 			<!-- <view class="price">￥{{max.startingPrice}}</view> -->
 			<UiMoney class="price" :money="max.startingPrice" prefix></UiMoney>
 			<view class="img-box">
-				<image class="img" :src="max.mainPicture"/>
+				<image class="img" :src="max.recommendPicture"/>
 			</view>
 		</view>
 		<view class="min" @click="$Router.push(`/goodsDetail?id=${minOne.id}`)">
-			<view class="title">{{minOne.name}}</view>
+			<view class="title">{{minOne.title}}</view>
 			<view class="min--info-box">
 				<view class="min--info-box-right">
-					<view class="desc">{{minOne.name}}</view>
+					<view class="desc">{{minOne.subTitle}}</view>
 					<!-- <view class="tag"></view> -->
 					<UiMoney class="price" :money="minOne.startingPrice" prefix></UiMoney>
 				</view>
 				<view class="img-box">
-					<image class="img" :src="minOne.mainPicture"/>
+					<image class="img" :src="minOne.recommendPicture"/>
 				</view>
 			</view>
 		</view>
 		<view class="min" @click="$Router.push(`/goodsDetail?id=${minTwo.id}`)">
-			<view class="title">{{minTwo.name}}</view>
+			<view class="title">{{minTwo.title}}</view>
 			<view class="min--info-box">
 				<view class="min--info-box-right">
-					<view class="desc">{{minTwo.name}}</view>
+					<view class="desc">{{minTwo.subTitle}}</view>
 					<view class="tag"></view>
 					<UiMoney class="price" :money="minTwo.startingPrice" prefix></UiMoney>
 				</view>
 				<view class="img-box">
-					<image class="img" :src="minTwo.mainPicture"/>
+					<image class="img" :src="minTwo.recommendPicture"/>
 				</view>
 			</view>
 		</view>
diff --git a/pages/order/detail/components/Operation.vue b/pages/order/detail/components/Operation.vue
index a1f9cdb..0394faf 100644
--- a/pages/order/detail/components/Operation.vue
+++ b/pages/order/detail/components/Operation.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 18:04:27
+ * @LastEditTime: 2022-04-21 18:49:52
  * @Description: file content
 -->
 <template>
@@ -20,21 +20,21 @@
 			</template>
 			<u-popup class="cancel" :show="cancelShow" @close="closeCancel" round="16rpx" closeable>
 				<view class="cancel--title">取消订单原因</view>
-				<radio-group class="cancel--cell" @change="cancelChange">
-					<UiCell title="我不想买了">
-						<radio slot="right-icon" value="1" class="cancel--radio" color="#FF875B"/>
+				<radio-group class="cancel--cell">
+					<UiCell title="我不想买了" @click="cancelChange(1)">
+						<radio slot="right-icon" :checked="cancelValue == 1" class="cancel--radio" color="#FF875B"/>
 					</UiCell>
-					<UiCell title="地址信息填写错误">
-						<radio slot="right-icon" value="2" class="cancel--radio" color="#FF875B"/>
+					<UiCell title="地址信息填写错误" @click="cancelChange(2)">
+						<radio slot="right-icon" :checked="cancelValue == 2" class="cancel--radio" color="#FF875B"/>
 					</UiCell>
-					<UiCell title="商品降价">
-						<radio slot="right-icon" value="3" class="cancel--radio" color="#FF875B"/>
+					<UiCell title="商品降价" @click="cancelChange(3)">
+						<radio slot="right-icon" :checked="cancelValue == 3" class="cancel--radio" color="#FF875B"/>
 					</UiCell>
-					<UiCell title="商品无货">
-						<radio slot="right-icon" value="4" class="cancel--radio" color="#FF875B"/>
+					<UiCell title="商品无货" @click="cancelChange(4)">
+						<radio slot="right-icon" :checked="cancelValue == 4" class="cancel--radio" color="#FF875B"/>
 					</UiCell>
-					<UiCell title="其他">
-						<radio slot="right-icon" value="5" class="cancel--radio" color="#FF875B"/>
+					<UiCell title="其他" @click="cancelChange(5)">
+						<radio slot="right-icon" :checked="cancelValue == 5" class="cancel--radio" color="#FF875B"/>
 					</UiCell>
 				</radio-group>
 				<view class="cancel--footer">
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 6b97457..4809136 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 17:36:30
+ * @LastEditTime: 2022-04-21 18:30:09
  * @Description: file content
 -->
 <template>
@@ -51,7 +51,7 @@
 					v-if="item.orderStatus == 4" @click="receive(item)">确认收货</button>
 			</view>
 		</view>
-		<u-loadmore :status="loadingStatus" v-if="orderListData.length" />
+		<u-loadmore :status="loadingStatus" v-if="loadingStatus === 'loading'"/>
 
 		<BsPay :show.sync="payShow" :order="payOrder"></BsPay>
 	</view>
@@ -111,7 +111,7 @@ export default {
 				return false;
 			}
 			// 标记是否为最后一页
-			if(!result.records.length){
+			if(result.records.length < this.pageSize){
 				this.loadingStatus = 'nomore';
 			}
 			this.orderListData = this.orderListData.concat(result.records);
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index ad5c207..6cb7100 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 11:27:13
+ * @LastEditTime: 2022-04-21 18:44:17
  * @Description: file content
 -->
 <template>
@@ -153,6 +153,7 @@ export default {
 			const {error, result} = await ApiPostSubmitOrder({
 				orderSource : 2,
 				recipientAddressId : this.address.id,
+				shoppingCartIds : query.ids ? query.ids.split(',') : [],
 				products : this.orderInfo.products.map(i => ({
 					productId : i.productId,
 					productSkuId : i.productSkuId,