Feat(时令尝鲜):接口对接

pages/order/OrderSubmission/index.vue

@@ -142,13 +142,13 @@
           </view>
         </view>
       </view>
-      <view class="item">
+      <view class="item" style="z-index: -1">
         <view class="acea-row row-middle">
           <image style="width: 32rpx;height: 32rpx;margin-right: 12rpx;" :src="webUrl+'/20210807230836494421.png'"
                  mode=""></image>
-          <text class="">备注信息（150字以内</text>
+          <text class="">备注信息（150字以内)</text>
         </view>
-        <textarea v-model="mark"></textarea>
+        <textarea v-model="mark" ></textarea>
       </view>
     </view>
     <view class="wrapper" style="margin: 30rpx 0;border-radius: 16rpx;">

pages/order/ReturnList/index.vue

@@ -3,19 +3,16 @@
     <view class="goodWrapper" v-for="(order,orderListIndex) in orderList" :key="orderListIndex">
       <view class="iconfont icon-tuikuanzhong powder" v-if="order._status._type === '-1'"></view>
       <view class="iconfont icon-yituikuan" v-if="order._status._type === '-2'"></view>
+      <image class="iconfont" :src="webUrl+'/20230713110051999762.png'" v-if="order._status._type === '-3'"/>
       <view class="orderNum">订单号：{{ order.orderId }}</view>
-	  <!-- <view class="acea-row row-between row-middle orderNum" style="flex-wrap: nowrap;">
-		  <view class="orderNum">订单号：{{ order.orderId }}</view>
-		  <view class="font-color-red" style="flex-shrink: 0;font-size: 28rpx;">{{order._status._title}}</view>
-	  </view> -->
       <view
-        class="item acea-row row-between-wrapper"
-        v-for="(cart,cartInfoIndex) in order.cartInfo"
-        :key="cartInfoIndex"
-        @click="goOrderDetails(order)"
+          class="item acea-row row-between-wrapper"
+          v-for="(cart,cartInfoIndex) in order.cartInfo"
+          :key="cartInfoIndex"
+          @click="goOrderDetails(order)"
       >
         <view class="pictrue">
-          <image :src="cart.productInfo.image" class="image" @click.stop="goGoodsCon(cart)" />
+          <image :src="cart.productInfo.image" class="image" @click.stop="goGoodsCon(cart)"/>
         </view>
         <view class="text">
           <view class="acea-row row-between-wrapper">
@@ -23,9 +20,10 @@
             <view class="num">x {{ cart.cartNum }}</view>
           </view>
           <view
-            class="attr line1"
-            v-if="cart.productInfo.attrInfo"
-          >{{ cart.productInfo.attrInfo.sku }}</view>
+              class="attr line1"
+              v-if="cart.productInfo.attrInfo"
+          >{{ cart.productInfo.attrInfo.sku }}
+          </view>
           <view class="attr line1" v-else>{{ cart.productInfo.storeName }}</view>
           <view class="money">￥{{ cart.productInfo.price }}</view>
         </view>
@@ -33,13 +31,14 @@
       <view class="totalSum">
         共{{ order.cartInfo.length || 0 }}件商品，总金额
         <text
-          class="font-color-red price"
-        >￥{{ order.payPrice }}</text>
+            class="font-color-red price"
+        >￥{{ order.payPrice }}
+        </text>
       </view>
     </view>
     <view class="noCart" v-if="orderList.length === 0 && page > 1">
       <view class="pictrue">
-        <image :src="webUrl+'/20210203155245713983.png'" />
+        <image :src="webUrl+'/20210203155245713983.png'"/>
       </view>
     </view>
     <Loading :loaded="loaded" :loading="loading"></Loading>
@@ -47,7 +46,7 @@
 </template>
 
 <script>
-import { getOrderList } from "@/api/order";
+import {getOrderList} from "@/api/order";
 import Loading from "@/components/Loading";
 
 export default {
@@ -57,7 +56,7 @@ export default {
   },
   data() {
     return {
-	  webUrl:this.$VUE_APP_RESOURCES_URL,
+      webUrl: this.$VUE_APP_RESOURCES_URL,
       orderList: [],
       page: 1,
       limit: 20,
@@ -69,17 +68,17 @@ export default {
     goGoodsCon(cart) {
       this.$yrouter.push({
         path: "/pages/shop/GoodsCon/index",
-        query: { id: cart.productInfo.id }
+        query: {id: cart.productInfo.id}
       });
     },
     goOrderDetails(order) {
       this.$yrouter.push({
         path: "/pages/order/OrderDetails/index",
-        query: { id: order.orderId }
+        query: {id: order.orderId}
       });
     },
     getOrderList() {
-      const { page, limit } = this;
+      const {page, limit} = this;
       if (this.loading || this.loaded) return;
       this.loading = true;
       getOrderList({