首页改版

src/main/resources/static/js/mixins/cmSysMixins.js

@@ -22,7 +22,7 @@ var cmSysVitaMixins = function () {
                 handleShopKey:'',
                 consultParams:{
                     ip:'',
-                    shopId:'',
+                    shopProductId:'',
                     createTime:'',
                     consultMobile: '',
                     consultName: '',
@@ -121,7 +121,7 @@ var cmSysVitaMixins = function () {
                 PublicApi.getUserPopUpInfo(params, function (response) {
                     if(response.code === 0){
                         _self.advertisement = response.data
-                        _self.consultParams.shopId =  response.data.shopId
+                        _self.consultParams.shopProductId =  response.data.shopProductId
                     }else{
                         console.log('error',response.msg);
                     }

src/main/resources/static/js/product/detail.js

@@ -72,7 +72,8 @@ var productDetail = new Vue({
         isShowCaimeiShop:false,
         isHideButton:false,
         returnGoodsStutas: false, // 当前商品是否为特殊商品
-        helpContent: '' // 退货提示
+        helpContent: '', // 退货提示
+        tooltipVisible:false
     },
     filters: {
         TypeFormat: function (value) {
@@ -388,44 +389,63 @@ var productDetail = new Vue({
                 looseBody();
             }
         },
-        numberSub: function () {
-            this.number -= this.priceObj.step;
+        handleNumberSub () {
+            if(this.priceObj.step === 2){
+                this.number -= this.priceObj.minBuyNumber
+            }else{
+                this.number -= this.priceObj.step
+            }
             console.log('number', this.number)
             this.numberResize();
         },
-        numberAdd: function () {
-            this.number += this.priceObj.step;
+        handleNumberAdd () {
+            if(this.priceObj.step === 2){
+                this.number += this.priceObj.minBuyNumber
+            }else{
+                this.number += this.priceObj.step
+            }
             console.log('number', this.number)
             this.numberResize();
 
         },
-        numberChange: function () {
-            this.number = Math.ceil(this.number / this.priceObj.step) * this.priceObj.step;
-            this.numberResize();
-
+        handleNumberChange (event) {
+            const value = event.target.value;
+            console.log('value',value)
+           if (value < this.priceObj.minBuyNumber) {
+                this.number = this.priceObj.minBuyNumber
+            } else {
+                if (this.priceObj.step === 2) {
+                    if (value % this.priceObj.minBuyNumber !== 0) {
+                        this.$message.error('购买量必须为起订量的整数倍');
+                        this.number = this.priceObj.minBuyNumber
+                    } else if (value > this.priceObj.stock) {
+                        this.number = this.priceObj.stock
+                    } else {
+                        this.number = value
+                    }
+                }else{
+                    if (value > this.priceObj.stock) {
+                        this.productCount = this.priceObj.stock
+                    } else {
+                        this.productCount = value
+                    }
+                }
+            }
         },
-        numberResize: function () {
-            var _self = this;
+        numberResize () {
             if (this.number < this.priceObj.minBuyNumber) {
                 this.number = this.priceObj.minBuyNumber;
             }
             if (this.number > this.productStock) {
                 this.number = this.productStock;
             }
-            // if (this.priceObj.ladderPriceFlag) {
-            //     this.ladderList.forEach(function (ladder) {
-            //         if (_self.number >= ladder.buyNum) {
-            //             _self.priceObj.price = ladder.buyPrice;
-            //         }
-            //     });
-            // }
             console.log('number', this.number)
         },
         handleCollection:function (){// 收藏操作
-            var _self = this;
+            const _self = this;
             console.log('_self.userId',_self.userId)
-            if (_self.userId > 0) {
-                ProductApi.getProductUserLike({userId: _self.userId, productId: _self.productId}, function (response) {
+            if (this.userId > 0) {
+                ProductApi.getProductUserLike({userId: this.userId, productId: this.productId}, function (response) {
                     if (response.code === 0 && response.data) {
                         _self.collectionType = !_self.collectionType
                         CAIMEI.dialog(response.data,false);
@@ -434,7 +454,7 @@ var productDetail = new Vue({
                     }
                 });
             }else{
-                _self.toLogin();
+                this.toLogin();
             }
         },
         toLogin: function () {
@@ -606,24 +626,24 @@ var productDetail = new Vue({
                     pros.number--
                 }
             }
-            _self.numberChange(pros);
+            this.numberChange(pros);
         },
         supportingNumberAdd: function(pros){  // 配套商品数量加加
-            var _self = this;
+            const _self = this;
             if (pros.step === 2) {
                 pros.number += pros.minBuyNumber
             } else {
                 pros.number++
             }
-            _self.numberChange(pros);
+            this.numberChange(pros);
         },
         supportingNumberChange: function(pros){ // 配套商品数量输入
-            var _self = this;
+            const _self = this;
             pros.number = Math.ceil(pros.number/pros.step)*pros.step;
-            _self.numberChange(pros);
+            this.numberChange(pros);
         },
-        numberChange: function(pros){
-            var _self = this;
+        numberChange(pros){
+            const _self = this;
             if(pros.ladderPriceFlag){
                 pros.ladderPrices.forEach(function(ladder){
                     if(pros.number>=ladder.buyNum){

src/main/resources/static/js/supplier-center/shop/mixins/categoryMixins.js

@@ -8,10 +8,11 @@ const categoryMixins = function () {
                     name: '',
                     shopId:'',
                     pageNum:1,
-                    pageSize:10
+                    pageSize:100
                 },
                 list: [],
                 total: 0,
+                layout:'total, prev, pager, next, jumper',
                 shopsRadio: null,
                 isLoading: true
             }
@@ -31,6 +32,11 @@ const categoryMixins = function () {
                 this.listQuery.pageNum = 1
                 this.getShopList()
             },
+            //切换类别页码
+            handleCategoryChange(val){
+                this.listQuery.pageNum = val;
+                this.getShopList();
+            },
             // 获取所有供应商列表
             getShopList() {
                 const _this = this;

src/main/resources/static/js/supplier/index.js

@@ -165,8 +165,6 @@ var supplierHome = new Vue({
                             // 图片懒加载
                             $("img[data-original]").lazyload();
                         },500);
-                    } else {
-                        _self.$message.error(res.msg)
                     }
                 }
             );
@@ -196,15 +194,13 @@ var supplierHome = new Vue({
                         _self.productLists = _self.productLists.concat(resultData);
                         console.log('productLists',_self.productLists)
                         _self.requestFlag = true;
-                    } else {
-                        _self.$message.error(res.msg)
                     }
                 }
             );
         },
         PromotionsFormat(promo){//促销活动类型数据处理
             if(promo!=null){
-                if(promo.type == 1 && promo.mode == 1){
+                if(promo.type === 1 && promo.mode === 1){
                     return true
                 }else{
                     return false

src/main/resources/templates/product/detail.html

@@ -251,10 +251,9 @@
                     </div>
                     <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量：</span>
                         <span class="number">
-                            <em class="sub" @click="numberSub">-</em>
-                            <input type="number" :value="number" v-model="number" maxlength='6'
-                                   @change="numberChange">
-                            <em class="add" @click="numberAdd">+</em>
+                            <em class="sub" @click="handleNumberSub">-</em>
+                            <input type="number" :value="number" v-model="number" maxlength='6' @change="handleNumberChange">
+                            <em class="add" @click="handleNumberAdd">+</em>
                         </span>
                         <input type="hidden" th:value="*{step}">
                     </div>

src/main/resources/templates/supplier-center/components/disguise-dialog.html

@@ -37,14 +37,18 @@
     <el-table-column label="商品名称" prop="name" align="center"></el-table-column>
   </el-table>
   <!-- 页码 -->
-  <pagination
-          :total="total"
-          :page-sizes="[100, 200]"
-          :page-size="100"
-          :page.sync="listQuery.pageNum"
-          :limit.sync="listQuery.pageSize"
-          @pagination="getShopList"
-  ></pagination>
+  <div class="pagination">
+    <el-pagination
+            background
+            :small="false"
+            @current-change="handleCategoryChange"
+            :current-page="listQuery.pageNum"
+            :page-size="listQuery.pageSize"
+            :layout="layout"
+            :total="total"
+    >
+  </div>
+  </el-pagination>
   <div slot="footer">
     <el-button @click="handleCanle"> 取 消 </el-button>
     <el-button type="primary" :disabled="disabled" @click="handleConfirm"> 确 定 </el-button>