Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/api/order.js

@@ -115,3 +115,21 @@ export function getLogisticsCompany () {
     params: { pageNumber: 1, pageSize: 200, disabled: 'OPEN' }
   });
 }
+
+//查询包裹列表
+export const getPackage = (sn) => {
+  return request({
+    url: `/buyer/order/order/getPackage/${sn}`,
+    method: Method.GET,
+    needToken: true,
+  })
+}
+
+//查询物流
+export const getTracesList = (sn, params) => {
+  return request({
+    url: `/buyer/order/order/getTracesList/${sn}`,
+    method: Method.GET,
+    needToken: true,
+  })
+};

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -5,9 +5,8 @@
       <div class="item-detail-left">
         <!-- 大图、放大镜 -->
         <!-- <div  id="dplayer"></div> -->
-        <div class="item-detail-big-img">
-
-          <pic-zoom  :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
+        <div class="item-detail-big-img" v-if="imgList[imgIndex]">
+          <pic-zoom :url="imgList[imgIndex].url || imgList[imgIndex]" :scale="2"></pic-zoom>
         </div>
 
         <!-- <div  id="dplayer"></div> -->
@@ -19,7 +18,7 @@
             v-for="(item, index) in imgList"
             :key="index"
           >
-            <img :src="item.url" />
+            <img :src="item.url || item"/>
           </div>
         </div>
 
@@ -355,7 +354,7 @@ export default {
       count: 1, // 商品数量
       imgIndex: 0, // 展示图片下标
       currentSelceted: [], // 当前商品sku
-      imgList: [{ url: "" }], // 商品图片列表
+      imgList: [], // 商品图片列表
       skuDetail: {
         specList: [],
       }, // sku详情
@@ -581,9 +580,13 @@ export default {
     swiperGoodsImg() {
       this.skuDetail.specList.forEach((e) => {
         if (e.specName === "images") {
-          this.imgList = e.specImage;
+          this.imgList = this.skuDetail.goodsGalleryList.filter(i => i.indexOf("\"url\":") === -1 && i.indexOf("\"status\":") === -1);
         }
       });
+      if (!this.imgList) {
+        this.imgList = [this.skuDetail.original];
+      }
+      console.log(this.imgList);
 
     },
   },

buyer/src/pages/GoodsDetail.vue

@@ -130,6 +130,9 @@ export default {
             });
             this.categoryBar = cateArr;
             this.$set(this, "goodsMsg", res.result);
+            if (!this.goodsMsg.data.intro) {
+              this.goodsMsg.data.intro = ''
+            }
             // 判断是否收藏
             if (this.Cookies.getItem("userInfo")) {
               isStoreCollection("STORE", this.goodsMsg.data.storeId).then((res) => {

buyer/src/pages/Merchant.vue

@@ -227,6 +227,7 @@ export default {
             this.getIndexData();
           } else {
             this.getGoodsList();
+            this.getCateList();
           }
           let that = this;
           window.onscroll = function () {
@@ -246,6 +247,7 @@ export default {
       getCateById(this.$route.query.id).then((res) => {
         if (res.success) {
           this.cateList = res.result;
+          console.log(this.cateList,'cateList')
         }
       });
     },

buyer/src/pages/home/enumeration.js

@@ -30,7 +30,7 @@ export const orderStatusList = [
     status: 'TAKE'
   },
   {
-    name: '已取消',
+    name: '已关闭',
     status: 'CANCELLED'
   },
   {

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

@@ -51,12 +51,11 @@
               <div>
                 <div class="hover-color" @click="goodsDetail(goods.skuId, goods.goodsId)">{{ goods.name }}</div>
                 <div class="mt_10">
-                  <span class="global_color"
-                    >{{ goods.goodsPrice | unitPrice("￥") }} </span
-                  >x {{ goods.num }}
+                  <span class="global_color">{{ goods.goodsPrice | unitPrice("￥") }} </span>x {{ goods.num }}
+                  <span style="margin-left: 10px;color: #ff9900;">{{refundPriceList(goods.isRefund)}}</span>
                 </div>
-                <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:100px;margin-right:10px">评价</Button>
-                <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small" style="position:relative;top:-22px;left:100px">投诉</Button>
+                <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:190px;margin-right:10px">评价</Button>
+                <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small" style="position:relative;top:-22px;left:190px">投诉</Button>
               </div>
             </div>
           </div>
@@ -155,6 +154,21 @@ export default {
     this.getList();
   },
   methods: {
+    // 退款状态枚举
+    refundPriceList(status) {
+      switch (status) {
+        case 'ALL_REFUND':
+          return "全部退款";
+        case 'PART_REFUND':
+          return "部分退款";
+        case 'NO_REFUND':
+          return "";
+        case 'REFUNDING':
+          return "退款中";
+        default:
+          return "";
+      }
+    },
     goodsDetail (skuId, goodsId) {
       // 跳转商品详情
       let routeUrl = this.$router.resolve({

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

@@ -30,6 +30,7 @@
         size="small"
         >取消订单</Button
       >
+      <Button v-if="order.allowOperationVO.showLogistics || orderPackage.length > 0 || logistics" type="info" @click="logisticsList()" size="small">查看物流</Button>
     </Card>
     <p class="verificationCode" v-if="order.order.verificationCode">
       核验码：<span>{{ order.order.verificationCode }}</span>
@@ -106,17 +107,17 @@
     <!-- 订单商品 -->
     <div class="goods">
       <div class="shop-name">
-        <span @click="shopPage(order.order.storeId)">{{
-          order.order.storeName
-        }}</span>
+        <span @click="shopPage(order.order.storeId)">{{order.order.storeName}}</span>
       </div>
       <table>
         <thead>
           <tr>
-            <th width="40%">商品</th>
-            <th width="20%">货号</th>
+            <th width="30%">商品</th>
+            <th width="15%">货号</th>
             <th width="10%">单价</th>
-            <th width="10%">数量</th>
+            <th width="5%">数量</th>
+            <th width="10%">退款状态</th>
+            <th width="10%">实际退款金额</th>
             <th width="10%">小计</th>
             <th width="10%">操作</th>
           </tr>
@@ -141,6 +142,8 @@
             <td>{{ goods.id }}</td>
             <td>{{ goods.goodsPrice | unitPrice("￥") }}</td>
             <td>{{ goods.num }}</td>
+            <td>{{refundPriceList(goods.isRefund)}}</td>
+            <td>{{ goods.refundPrice | unitPrice("￥") }}</td>
             <td>{{ (goods.goodsPrice * goods.num) | unitPrice("￥") }}</td>
             <td>
               <Button
@@ -226,6 +229,70 @@
         </Radio>
       </RadioGroup>
     </Modal>
+
+    <!--查询物流-->
+    <Modal v-model="logisticsModal" width="40">
+      <p slot="header"><span>查询物流</span></p>
+      <div class="layui-layer-wrap">
+        <dl>
+          <dt>订单号：</dt>
+          <dd><div class="text-box">{{ order.order.sn }}</div></dd>
+        </dl>
+      </div>
+      <div v-if="orderPackage.length > 0" v-for="(packageItem, packageIndex) in orderPackage" :key="packageIndex">
+        <div class="layui-layer-wrap">
+          <dl><dt>物流公司：</dt>
+            <dd><div class="text-box">{{ packageItem.logisticsName }}</div></dd>
+          </dl>
+          <dl><dt>快递单号：</dt>
+            <dd><div nctype="ordersSn" class="text-box">{{ packageItem.logisticsNo }}</div></dd>
+          </dl>
+          <div class="div-express-log">
+            <ul class="express-log express-log-name">
+              <li v-for="(item, index) in packageItem.orderPackageItemList" :key="index">
+                <span class="time" style="width: 50%;"><span>商品名称：</span><span>{{ item.goodsName }}</span></span>
+                <span class="time" style="width: 30%;"><span>发货时间：</span><span>{{ item.logisticsTime }}</span></span>
+                <span class="time" style="width: 20%;"><span>发货数量：</span><span>{{ item.deliverNumber }}</span></span>
+              </li>
+            </ul>
+            <div class="div-express-log" style="overflow: hidden;">
+              <ul class="express-log" v-if="packageItem.traces && packageItem.traces.traces">
+                <li v-for="(item, index) in packageItem.traces.traces" :key="index">
+                  <span class="time">{{ item.AcceptTime || item.acceptTime }}</span>
+                  <span class="detail">{{ item.AcceptStation || item.remark }}</span>
+                </li>
+              </ul>
+              <ul class="express-log" v-else><li>暂无物流信息</li></ul>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-if = "orderPackage.length == 0 && logistics">
+        <div class="layui-layer-wrap">
+          <dl>
+            <dt>物流公司：</dt>
+            <dd><div class="text-box">{{ logistics.shipper }}</div></dd>
+          </dl>
+          <dl>
+            <dt>快递单号：</dt>
+            <dd><div nctype="ordersSn" class="text-box">{{ logistics.logisticCode }}</div></dd>
+          </dl>
+          <div class="div-express-log">
+            <ul class="express-log" v-if="logistics && logistics.traces">
+              <li v-for="(item, index) in logistics.traces" :key="index">
+                <span class="time">{{ item.AcceptTime }}</span>
+                <span class="detail">{{ item.AcceptStation }}</span>
+              </li>
+            </ul>
+            <ul class="express-log" v-else><li>暂无物流信息</li></ul>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button @click="logisticsModal = false">取消</Button>
+      </div>
+    </Modal>
+
   </div>
 </template>
 <script>
@@ -234,6 +301,7 @@ import {
   getTraces,
   sureReceived,
   cancelOrder,
+  getPackage
 } from "@/api/order.js";
 import { afterSaleReason } from "@/api/member";
 export default {
@@ -250,9 +318,27 @@ export default {
       },
       cancelAvail: false, // 取消订单modal控制
       cancelReason: [], // 取消订单原因
+      orderPackage: [],
+      packageTraceList: [],
+      logisticsModal: false,
     };
   },
   methods: {
+    // 退款状态枚举
+    refundPriceList(status) {
+      switch (status) {
+      case 'ALL_REFUND':
+        return "全部退款";
+      case 'PART_REFUND':
+        return "部分退款";
+      case 'NO_REFUND':
+        return "未退款";
+      case 'REFUNDING':
+        return "退款中";
+      default:
+          return "未退款";
+      }
+    },
     goodsDetail(skuId, goodsId) {
       // 跳转商品详情
       let routeUrl = this.$router.resolve({
@@ -276,11 +362,19 @@ export default {
           this.order = res.result;
           this.progressList = res.result.orderLogs;
           if (this.order.order.deliveryMethod === 'LOGISTICS') {
+            this.getOrderPackage(this.order.order.sn);
             this.traces();
           }
         }
       });
     },
+    getOrderPackage(sn) {
+      getPackage(sn).then(res => {
+        if (res.success) {
+          this.orderPackage = res.result
+        }
+      })
+    },
     traces() {
       // 物流信息
       getTraces(this.$route.query.sn).then((res) => {
@@ -289,6 +383,15 @@ export default {
         }
       });
     },
+    logisticsList() {
+      this.logisticsModal = true;
+      this.packageTraceList = this.orderPackage;
+      // getTracesList(this.order.order.sn).then((res) => {
+      //   if (res.success && res.result != null) {
+      //     this.packageTraceList = res.result;
+      //   }
+      // });
+    },
     received(sn) {
       // 确认收货
       sureReceived(sn).then((res) => {
@@ -463,4 +566,120 @@ table {
 .progress {
   margin: 15px 0;
 }
+
+.layui-layer-wrap {
+  dl {
+    border-top: solid 1px #f5f5f5;
+    margin-top: -1px;
+    overflow: hidden;
+
+    dt {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 1% 8px 0;
+      color: #999;
+    }
+
+    dd {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 0 8px 8px;
+      border-left: solid 1px #f5f5f5;
+
+      .text-box {
+        line-height: 40px;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.layui-layer-wrap > .div-express-log {
+  max-height: 300px;
+}
+/deep/ .layui-layer-wrap > .div-express-log::-webkit-scrollbar{
+  width: 1px;
+  height: 5px;
+}
+/deep/ .layui-layer-wrap > .div-express-log::-webkit-scrollbar-thumb{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.3);
+}
+/deep/ .layui-layer-wrap > .div-express-log::-webkit-scrollbar-track{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.1);
+}
+
+
+.div-express-log {
+  max-height: 300px;
+  border: solid 1px #e7e7e7;
+  background: #fafafa;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+
+.express-log {
+  /*margin: 5px -10px 5px 5px;*/
+  padding: 10px;
+  list-style-type: none;
+
+  .time {
+    width: 30%;
+    display: inline-block;
+    float: left;
+  }
+
+  .detail {
+    width: 60%;
+    margin-left: 30px;
+    display: inline-block;
+  }
+
+  li {
+    line-height: 30px;
+  }
+}
+
+.express-log-name {
+  li {
+    display: flex;
+    span  {
+      display: flex;
+    }
+  }
+}
+
+.layui-layer-wrap {
+  dl {
+    border-top: solid 1px #f5f5f5;
+    margin-top: -1px;
+    overflow: hidden;
+
+    dt {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 1% 8px 0;
+      color: #999;
+    }
+
+    dd {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 0 8px 8px;
+      border-left: solid 1px #f5f5f5;
+
+      .text-box {
+        line-height: 40px;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
 </style>

buyer/src/pages/home/userCenter/MoneyManagement.vue

@@ -368,6 +368,8 @@ export default {
             if (params.row.applyStatus === 'APPLY') {
               return h('div', [h('span', {}, '申请中')]);
             } else if (params.row.applyStatus === 'VIA_AUDITING') {
+              return h('div', [h('span', {}, '审核通过')]);
+            } else if (params.row.applyStatus === 'SUCCESS') {
               return h('div', [h('span', {}, '提现成功')]);
             } else if (params.row.applyStatus === 'ERROR') {
               return h('div', [h('span', {}, '提现失败')]);

buyer/src/pages/shopEntry/ShopEntry.vue

@@ -28,7 +28,9 @@
     </div>
 
     <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
-      <div class="agreeent-con" v-html="agreementCon"></div>
+      <Scroll :on-reach-bottom="handleReachBottom">
+        <div class="agreeent-con" v-html="agreementCon"></div>
+      </Scroll>
 
       <div slot="footer" style="text-align: center">
         <p>
@@ -40,6 +42,7 @@
   </div>
 </template>
 <script>
+
 import { agreement, applyStatus } from "@/api/shopentry";
 import firstApply from "./FirstApply";
 import secondApply from "./SecondApply";
@@ -69,6 +72,9 @@ export default {
       agreement().then((res) => {
         this.agreementCon = res.result.content;
       });
+    },
+    handleReachBottom(){
+
     },
     getData(status) {
       // 获取已填写店铺信息
@@ -147,8 +153,11 @@ export default {
     },
   },
   mounted() {
-    this.getData("init");
-    this.getArticle();
+
+      this.getData("init");
+      this.getArticle();
+
+
   },
 };
 </script>
@@ -173,6 +182,10 @@ export default {
 }
 .agreeent-con {
   max-height: 500px;
+  ::v-deep img{
+    max-width: 100%;
+
+  }
 }
 .success-page {
   height: 500px;