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

buyer/src/api/member.js

@@ -478,3 +478,15 @@ export function delMemberMsg (id) {
     needToken: true
   });
 }
+
+/**
+ * 绑定分销
+ * @param distributionId 商品分销ID
+ */
+export function getGoodsDistribution (distributionId) {
+  return request({
+    url: `/buyer/distribution/bindingDistribution/${distributionId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}

buyer/src/pages/GoodsDetail.vue

@@ -8,12 +8,19 @@
       <div class="shop-nav-container">
         <Breadcrumb>
           <BreadcrumbItem to="/">首页</BreadcrumbItem>
-          <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem>
+          <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">
+            {{ item.name }}
+          </BreadcrumbItem>
         </Breadcrumb>
         <div class="store-collect">
-          <span class="mr_10" v-if="goodsMsg.data"><router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span>
-          <span @click="collect" ><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
-          <span @click="connectCs(storeMsg.yzfSign)" class="ml_10"><Icon custom="icomoon icon-customer-service" />联系客服</span>
+          <span class="mr_10" v-if="goodsMsg.data"><router-link
+            :to="'Merchant?id=' + goodsMsg.data.storeId">{{ goodsMsg.data.storeName }}</router-link></span>
+          <span @click="collect"><Icon type="ios-heart"
+                                       :color="storeCollected ? '#ed3f14' : '#666'"/>{{
+              storeCollected ? '已收藏店铺' : '收藏店铺'
+            }}</span>
+          <span @click="connectCs(storeMsg.yzfSign)" class="ml_10"><Icon
+            custom="icomoon icon-customer-service"/>联系客服</span>
         </div>
       </div>
     </div>
@@ -32,9 +39,10 @@ import Search from '@/components/Search';
 import ShopHeader from '@/components/header/ShopHeader';
 import ShowGoods from '@/components/goodsDetail/ShowGoods';
 import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail';
-import { goodsSkuDetail } from '@/api/goods';
-import { cancelCollect, collectGoods, isCollection } from '@/api/member';
+import {goodsSkuDetail} from '@/api/goods';
+import {cancelCollect, collectGoods, isCollection, getGoodsDistribution} from '@/api/member';
 import {getDetailById} from '@/api/shopentry'
+
 export default {
   name: 'GoodsDetail',
   beforeRouteEnter (to, from, next) {
@@ -57,7 +65,24 @@ export default {
     // 获取商品详情
     getGoodsDetail () {
       this.isLoading = true;
-      const params = this.$route.query
+      const params = this.$route.query;
+      // 分销员id
+      let distributionId = (params && params.distributionId) ? params.distributionId : this.Cookies.getItem('distributionId');
+      // 如果有分销信息
+      if (distributionId) {
+        console.log(distributionId)
+        // 先存储
+        this.Cookies.setItem('distributionId', params.distributionId)
+        let _this = this;
+        // 绑定关系
+        getGoodsDistribution(params.distributionId).then(res => {
+          // 绑定成功，则清除关系
+          if (res.success) {
+            _this.Cookies.removeItem('distributionId');
+          }
+        })
+      }
+
       goodsSkuDetail(params).then((res) => {
         this.isLoading = false;
         if (res.success) {
@@ -125,8 +150,7 @@ export default {
       location.reload();
     }
   },
-  computed: {
-  },
+  computed: {},
   components: {
     Search,
     ShopHeader,
@@ -147,13 +171,15 @@ export default {
   width: 1200px;
   margin: 0 auto;
   position: relative;
+
   .store-collect {
     position: absolute;
     right: 20px;
     top: 0;
     color: #999;
-    span{
-      &:hover{
+
+    span {
+      &:hover {
         cursor: pointer;
         color: $theme_color;
       }

seller/src/views/order/after-order/returnGoodsOrder.vue

@@ -142,7 +142,6 @@
             title: "申请退款金额",
             key: "applyRefundPrice",
             width: 130,
-            sortType: "desc",
             render: (h, params) => {
               return h(
                 "div",

seller/src/views/promotion/seckill/seckill.vue

@@ -54,7 +54,7 @@
         </template>
       </Table>
       <Row type="flex" justify="end" class="mt_10">
-        <Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
           size="small" show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
@@ -71,7 +71,7 @@ export default {
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
         sort: "startTime",
         order: "desc", // 默认排序方式
@@ -145,7 +145,7 @@ export default {
     },
     // 分页 改变页码
     changePage(v) {
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
       this.getDataList();
     },
     // 分页 改变页数
@@ -155,7 +155,7 @@ export default {
     },
     // 搜索
     handleSearch() {
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
@@ -163,7 +163,7 @@ export default {
     handleReset() {
       this.searchForm = {};
       this.selectDate = "";
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },