搜索热词，pc端注释，管理端结算单订单号字段错误

buyer/src/pages/home/orderCenter/AddAddress.vue

@@ -10,21 +10,22 @@
         :rules="ruleInline"
       >
         <FormItem label="收件人" prop="name">
-          <i-input v-model="formData.name" style="width: 600px"></i-input>
+          <i-input v-model="formData.name" placeholder="请输入收件人姓名" style="width: 600px"></i-input>
         </FormItem>
         <FormItem label="收件地区" prop="address">
           <i-input
             v-model="formData.address"
             disabled
+            placeholder="请选择收货地址" 
             style="width: 600px"
           ></i-input>
           <Button type="primary" size="small" @click="$refs.map.showMap = true">选择</Button>
         </FormItem>
         <FormItem label="详细地址" prop="detail">
-          <i-input v-model="formData.detail" style="width: 600px"></i-input>
+          <i-input v-model="formData.detail" placeholder="请输入详细地址"  style="width: 600px"></i-input>
         </FormItem>
         <FormItem label="手机号码" prop="mobile">
-          <i-input v-model="formData.mobile" style="width: 600px"></i-input>
+          <i-input v-model="formData.mobile" placeholder="请输入收件人手机号"  style="width: 600px"></i-input>
         </FormItem>
         <FormItem label="地址别名">
           <i-input

buyer/src/pages/home/orderCenter/AfterSale.vue

@@ -45,7 +45,6 @@
                 </div>
               </div>
             </div>
-
             <div>
               <span @click="shopPage(order.shopId)">{{ order.storeName }}</span>
             </div>
@@ -201,7 +200,7 @@ export default {
       this.getList()
     },
     changePageSize (val) { // 修改页数
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     },

buyer/src/pages/home/orderCenter/AfterSaleDetail.vue

@@ -54,7 +54,7 @@
           <td>商品处理方式</td><td>{{afterSale.serviceType == 'RETURN_MONEY' ? '退款' : '退货'}}</td>
         </tr>
         <tr>
-          <td>退款原因</td><td>{{afterSale.reason}}</td>
+          <td>退款原因</td><td>{{afterSale.reasonName}}</td>
         </tr>
         <tr>
           <td>问题描述</td><td>{{afterSale.problemDesc}}</td>
@@ -70,7 +70,7 @@
   </div>
 </template>
 <script>
-import { afterSaleDetail, afterSaleLog } from '@/api/member.js';
+import { afterSaleDetail, afterSaleLog, afterSaleReason } from '@/api/member.js';
 import { afterSaleStatusList } from '../enumeration.js'
 export default {
   name: 'aftersale-detail',
@@ -78,6 +78,7 @@ export default {
     return {
       afterSale: {}, // 售后详情数据
       logList: [], // 日志
+      reasonList: [], // 售后原因列表
       afterSaleStatusList // 售后状态列表
     };
   },
@@ -87,6 +88,25 @@ export default {
         if (res.success) {
           this.afterSale = res.result;
           this.afterSale.serviceName = this.filterOrderStatus(this.afterSale.serviceStatus)
+          // 如果是原因id，则调接口查询原因中文释义
+          const pattern3 = new RegExp("[0-9]+");
+          if (pattern3.test(this.afterSale.reason)) {
+            this.getReason(this.afterSale.serviceType)
+          } else {
+            this.$set(this.afterSale, 'reasonName', this.afterSale.reason)
+          }
+        }
+      })
+    },
+    getReason (type) { // 获取售后原因
+      afterSaleReason(type).then(res => {
+        if (res.success) {
+          this.reasonList = res.result
+          this.reasonList.forEach(e=> {
+            if (e.id === this.afterSale.reason) {
+              this.$set(this.afterSale, 'reasonName', e.reason)
+            }
+          })
         }
       })
     },
@@ -99,7 +119,7 @@ export default {
       const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
       if (ob.length) return ob[0].name
     },
-    perviewImg (img) {
+    perviewImg (img) { // 查看图片
       window.open(img, '_blank')
     }
   },

buyer/src/pages/home/orderCenter/Complain.vue

@@ -8,47 +8,45 @@
         <span class="color999 ml_20" v-if="order.order">{{order.order.paymentTime}}</span>
       </p>
     </div>
-    <ul class="goods-eval">
-      <li >
-        <div class="goods-con">
-          <img :src="orderGoods.image" class="hover-pointer" alt="" width="100" @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)">
-          <p class="hover-pointer color999" @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)">{{orderGoods.goodsName}}</p>
-          <p>{{orderGoods.goodsPrice | unitPrice('￥')}}</p>
-        </div>
+    <div class="goods-eval">
+      <div class="goods-con">
+        <img :src="orderGoods.image" class="hover-pointer" alt="" width="100" @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)">
+        <p class="hover-pointer color999" @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)">{{orderGoods.goodsName}}</p>
+        <p>{{orderGoods.goodsPrice | unitPrice('￥')}}</p>
+      </div>
 
-        <div class="eval-con">
-          <div>
-            <span class="color999">投诉主题：</span>
-            <Select v-model="form.complainTopic" style="width:260px;margin-bottom:10px">
-              <Option v-for="item in reasonList" :value="item.reason" :key="item.id">{{ item.reason }}</Option>
-            </Select>
-            <Input type="textarea" maxlength="500" show-word-limit :rows="4" placeholder="请输入投诉内容" v-model="form.content" />
-          </div>
-          <div style="display:flex;align-items:center;">
-            <div class="demo-upload-list" v-for="(img, index) in orderGoods.uploadList" :key="index">
-              <img :src="img">
-              <div class="demo-upload-list-cover">
-                  <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
-                  <Icon type="ios-trash-outline" @click.native="handleRemove(index)"></Icon>
-              </div>
-            </div>
-            <Upload
-                :show-upload-list="false"
-                :on-success="handleSuccess"
-                :before-upload="handleBeforeUpload"
-                :format="['jpg','jpeg','png']"
-                :action="action"
-                :headers="accessToken"
-                style="display: inline-block;width:58px;">
-                <div class="hover-pointer icon-upload" style="">
-                  <Icon type="ios-camera" size="20"></Icon>
-                </div>
-            </Upload>
-            <div class="describe">上传投诉凭证，最多5张</div>
-          </div>
+      <div class="eval-con">
+        <div>
+          <span class="color999">投诉主题：</span>
+          <Select v-model="form.complainTopic" style="width:260px;margin-bottom:10px">
+            <Option v-for="item in reasonList" :value="item.reason" :key="item.id">{{ item.reason }}</Option>
+          </Select>
+          <Input type="textarea" maxlength="500" show-word-limit :rows="4" placeholder="请输入投诉内容" v-model="form.content" />
         </div>
-      </li>
-    </ul>
+        <div style="display:flex;align-items:center;">
+          <div class="demo-upload-list" v-for="(img, index) in orderGoods.uploadList" :key="index">
+            <img :src="img">
+            <div class="demo-upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+                <Icon type="ios-trash-outline" @click.native="handleRemove(index)"></Icon>
+            </div>
+          </div>
+          <Upload
+              :show-upload-list="false"
+              :on-success="handleSuccess"
+              :before-upload="handleBeforeUpload"
+              :format="['jpg','jpeg','png']"
+              :action="action"
+              :headers="accessToken"
+              style="display: inline-block;width:58px;">
+              <div class="hover-pointer icon-upload" style="">
+                <Icon type="ios-camera" size="20"></Icon>
+              </div>
+          </Upload>
+          <div class="describe">上传投诉凭证，最多5张</div>
+        </div>
+      </div>
+    </div>
     <Button type="primary" class="mt_10" :loading="loading" @click="save">提交</Button>
     <Modal title="View Image" v-model="visible">
         <img :src="previewImage" v-if="visible" style="width: 100%">
@@ -155,10 +153,8 @@ export default {
     font-weight: bold;
   }
 }
-.goods-eval li{
+.goods-eval{
   display: flex;
-  border-bottom: 1px solid #eee;
-
   .goods-con {
     width: 30%;
     padding: 20px;

buyer/src/pages/home/orderCenter/MyAddress.vue

@@ -3,12 +3,10 @@
     <card _Title="收货地址" _More="添加新地址" _Src="/home/addAddress"></card>
     <div class="address-box" v-for="(item, index) in list" :key="index">
       <div class="address-header">
-        <span
-          >{{ item.name }}
+        <span>
+          {{ item.name }}
           <Tag class="ml_10" v-if="item.isDefault" color="red">默认地址</Tag>
-          <Tag class="ml_10" v-if="item.alias" color="warning">{{
-            item.alias
-          }}</Tag>
+          <Tag class="ml_10" v-if="item.alias" color="warning">{{item.alias}}</Tag>
         </span>
         <div class="address-action">
           <span @click="edit(item.id)"><Icon type="edit"></Icon>修改</span>
@@ -81,9 +79,6 @@ export default {
   },
   mounted () {
     this.getAddrList();
-  },
-  components: {
-    card
   }
 };
 </script>

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -60,10 +60,8 @@
               </div>
             </div>
           </div>
-
           <div>
-            <span @click="shopPage(order.storeId)">{{ order.storeName }}</span
-            >
+            <span @click="shopPage(order.storeId)">{{ order.storeName }}</span>
           </div>
           <div>
             <!-- 订单基础操作 -->
@@ -79,25 +77,26 @@
       <Spin size="large" fix v-if="spinShow"></Spin>
     </div>
     <!-- 分页 -->
-    <div class="page-size" v-if="paging">
+    <div class="page-size" v-if="!homePage">
       <Page :total="total" @on-change="changePageNum"
         @on-page-size-change="changePageSize"
         :page-size="params.pageSize"
+        show-total
         show-sizer>
       </Page>
     </div>
     <!-- 选择售后商品 -->
     <Modal v-model="afterSaleModal" title="请选择申请售后的商品">
-        <div>
-            <Table
-              border
-              :columns="afterSaleColumns"
-              :data="afterSaleArr"
-              @on-row-click="afterSaleSelect"
-            >
-            </Table>
-        </div>
-        <div slot="footer"></div>
+      <div>
+        <Table
+          border
+          :columns="afterSaleColumns"
+          :data="afterSaleArr"
+          @on-row-click="afterSaleSelect"
+        >
+        </Table>
+      </div>
+      <div slot="footer"></div>
     </Modal>
     <Modal v-model="cancelAvail" title="请选择取消订单原因" @on-ok="sureCancel" @on-cancel="cancelAvail = false">
       <RadioGroup v-model="cancelParams.reason" vertical type="button" button-style="solid">
@@ -116,11 +115,7 @@ import { orderStatusList } from '../enumeration.js'
 export default {
   name: 'MyOrder',
   props: {
-    paging: {
-      type: Boolean,
-      default: true
-    },
-    homePage: {
+    homePage: { // 判断是否个人中心首页展示内容
       type: Boolean,
       default: false
     }

buyer/src/pages/home/orderCenter/OrderDetail.vue

@@ -96,10 +96,8 @@
   </div>
 </template>
 <script>
-import card from '@/components/card';
 import { orderDetail, getTraces } from '@/api/order.js';
 export default {
-  components: { card },
   name: 'order-detail',
   data () {
     return {