11

src/assets/css/user/coupon.less

@@ -10,11 +10,13 @@
       top:44px;
       top:44px;
       left:0px;
       left:0px;
       right:0px;
       right:0px;
+      background:#fff;
+      z-index:99
     }
     }
   }
   }
 
 
     /*优惠劵*/
     /*优惠劵*/
-  .coupon-box{ padding: 0 5px; }
+  .coupon-box{ padding: 44px 5px 0 ; }
   .coupon-box .block{overflow: hidden; margin-top: 15px;  /*border-top: .1rem solid #fff;*/ border-radius: 5px; background: #fff;-webkit-box-shadow: 0 2px 5px #ddd;box-shadow: 0 2px 5px #ddd; }
   .coupon-box .block{overflow: hidden; margin-top: 15px;  /*border-top: .1rem solid #fff;*/ border-radius: 5px; background: #fff;-webkit-box-shadow: 0 2px 5px #ddd;box-shadow: 0 2px 5px #ddd; }
   .coupon-box .block dt{ width:125px; padding:10px 8px; float: left; }
   .coupon-box .block dt{ width:125px; padding:10px 8px; float: left; }
   .coupon-box .block dt h4{ font-size: 36px; font-family: Impact; height: 40px; line-height: 40px; text-align: center; }
   .coupon-box .block dt h4{ font-size: 36px; font-family: Impact; height: 40px; line-height: 40px; text-align: center; }

src/store/modules/sample/sampleapply.js

@@ -52,6 +52,8 @@ const actions = {
             if (data.err_code == 0) {
             if (data.err_code == 0) {
                 state.submitState=true;
                 state.submitState=true;
                 state.ordernum = data.data||''
                 state.ordernum = data.data||''
+            }else if(data.err_code == '40014'){
+                Toast('样品库存不足');
             }else{
             }else{
                 Toast(data.err_msg);
                 Toast(data.err_msg);
             }
             }

src/views/sample/sample.vue

@@ -5,7 +5,7 @@
     <div class="banner"></div>
     <div class="banner"></div>
     <div class="zititle">
     <div class="zititle">
       <span>猎芯自营</span>
       <span>猎芯自营</span>
-      <font>品现货 1片起订 3小时发货</font>
+      <font>正品现货 1片起订 3小时发货</font>
     </div>
     </div>
     <div class="fx_text" v-if="fxType">
     <div class="fx_text" v-if="fxType">
       <!-- 邀请记录不为0 -->
       <!-- 邀请记录不为0 -->
@@ -65,7 +65,7 @@
               <span>最大可申请数量：</span>
               <span>最大可申请数量：</span>
               {{v.max_number}}
               {{v.max_number}}
             </p>
             </p>
-            <div class="btnx" @click="yaoqing(v.goods_id)">领取样品</div>
+            <div class="btnx" @click="yaoqing(v)">领取样品</div>
           </div>
           </div>
         </div>
         </div>
       </van-list>
       </van-list>
@@ -197,7 +197,7 @@ export default {
         })
         })
         .catch(function(err) {});
         .catch(function(err) {});
     },
     },
-    yaoqing(id) {
+    yaoqing(item) {
       let loginpta = util.isLogin() //1强登入态
       let loginpta = util.isLogin() //1强登入态
       if (loginpta!=1) {
       if (loginpta!=1) {
         window.location.href =
         window.location.href =
@@ -205,13 +205,18 @@ export default {
         return;
         return;
       } else {
       } else {
         if (this.applyCount!=0) {
         if (this.applyCount!=0) {
+          if(item.goods_info&&item.goods_info.stock){
             this.$router.push({
             this.$router.push({
               path: "/sampleapply",
               path: "/sampleapply",
               query: {
               query: {
-              id: id
+                id: item.goods_id
               }
               }
             });
             });
           }else{
           }else{
+              Toast("样品库存不足");
+          }
+        
+        }else{
           this.getPop = true;
           this.getPop = true;
         }
         }
       }
       }

view/app.js

@@ -4266,7 +4266,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.10@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.2.5@vant/es/index.js\");\n/* harmony import */ var _api_index__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../api/index */ \"./src/api/index.js\");\n/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../util */ \"./src/util/index.js\");\n\n\n\n\n\nvar qs = __webpack_require__(/*! qs */ \"./node_modules/_qs@6.9.0@qs/lib/index.js\");\n\nvue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].use(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"]);\nvar state = {\n  loading: false,\n  addressInfo: \"\",\n  submitState: false,\n  ypGoodDetail: {},\n  ordernum: ''\n};\nvar mutations = {\n  recvlistSample: function recvlistSample(state, payload) {\n    state.addressInfo = payload.data.filter(function (item) {\n      return item['is_default'] == 1;\n    });\n    state.addressInfo = state.addressInfo[0];\n  }\n};\nvar actions = {\n  recvlistSample: function recvlistSample(_ref, payload) {\n    var commit = _ref.commit;\n    _api_index__WEBPACK_IMPORTED_MODULE_2__[\"services\"].recvlist().then(function (res) {\n      var data = res.data; // state.loading = false;\n\n      if (data.err_code == 0) {\n        commit({\n          type: 'recvlistSample',\n          data: data.data\n        });\n      }\n    }).catch(function (err) {});\n  },\n  selfSampleCreate: function selfSampleCreate(_ref2, payload) {\n    var commit = _ref2.commit;\n    state.loading = true;\n    var params = {\n      goods_id: payload.goods_id,\n      apply_num: payload.apply_num,\n      com_name: payload.com_name,\n      sample_demand_desc: payload.sample_demand_desc,\n      address_id: payload.address_id\n    };\n    _api_index__WEBPACK_IMPORTED_MODULE_2__[\"services\"].selfSampleCreate(qs.stringify(params)).then(function (res) {\n      var data = res.data;\n      state.loading = false;\n\n      if (data.err_code == 0) {\n        state.submitState = true;\n        state.ordernum = data.data || '';\n      } else {\n        Object(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"])(data.err_msg);\n      }\n    }).catch(function (err) {\n      state.loading = false;\n    });\n  },\n  getDetailYp: function getDetailYp(_ref3, payload) {\n    var commit = _ref3.commit;\n    state.loading = true;\n    var Params_ = {\n      id: payload.data.id\n    };\n    var params = _util__WEBPACK_IMPORTED_MODULE_3__[\"default\"].getParams(Params_);\n    _api_index__WEBPACK_IMPORTED_MODULE_2__[\"services\"].getSampleInfo(params).then(function (res) {\n      var data = res.data;\n      state.loading = false;\n\n      if (data.err_code == 0) {\n        state.ypGoodDetail = data.data;\n      } else {\n        Object(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"])(data.err_msg);\n      }\n    }).catch(function (err) {\n      state.loading = false;\n    });\n  }\n};\nvar getters = {};\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n  state: state,\n  mutations: mutations,\n  actions: actions,\n  getters: getters\n});\n\n//# sourceURL=webpack:///./src/store/modules/sample/sampleapply.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.10@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.2.5@vant/es/index.js\");\n/* harmony import */ var _api_index__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../api/index */ \"./src/api/index.js\");\n/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../util */ \"./src/util/index.js\");\n\n\n\n\n\nvar qs = __webpack_require__(/*! qs */ \"./node_modules/_qs@6.9.0@qs/lib/index.js\");\n\nvue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].use(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"]);\nvar state = {\n  loading: false,\n  addressInfo: \"\",\n  submitState: false,\n  ypGoodDetail: {},\n  ordernum: ''\n};\nvar mutations = {\n  recvlistSample: function recvlistSample(state, payload) {\n    state.addressInfo = payload.data.filter(function (item) {\n      return item['is_default'] == 1;\n    });\n    state.addressInfo = state.addressInfo[0];\n  }\n};\nvar actions = {\n  recvlistSample: function recvlistSample(_ref, payload) {\n    var commit = _ref.commit;\n    _api_index__WEBPACK_IMPORTED_MODULE_2__[\"services\"].recvlist().then(function (res) {\n      var data = res.data; // state.loading = false;\n\n      if (data.err_code == 0) {\n        commit({\n          type: 'recvlistSample',\n          data: data.data\n        });\n      }\n    }).catch(function (err) {});\n  },\n  selfSampleCreate: function selfSampleCreate(_ref2, payload) {\n    var commit = _ref2.commit;\n    state.loading = true;\n    var params = {\n      goods_id: payload.goods_id,\n      apply_num: payload.apply_num,\n      com_name: payload.com_name,\n      sample_demand_desc: payload.sample_demand_desc,\n      address_id: payload.address_id\n    };\n    _api_index__WEBPACK_IMPORTED_MODULE_2__[\"services\"].selfSampleCreate(qs.stringify(params)).then(function (res) {\n      var data = res.data;\n      state.loading = false;\n\n      if (data.err_code == 0) {\n        state.submitState = true;\n        state.ordernum = data.data || '';\n      } else if (data.err_code == '40014') {\n        Object(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"])('样品库存不足');\n      } else {\n        Object(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"])(data.err_msg);\n      }\n    }).catch(function (err) {\n      state.loading = false;\n    });\n  },\n  getDetailYp: function getDetailYp(_ref3, payload) {\n    var commit = _ref3.commit;\n    state.loading = true;\n    var Params_ = {\n      id: payload.data.id\n    };\n    var params = _util__WEBPACK_IMPORTED_MODULE_3__[\"default\"].getParams(Params_);\n    _api_index__WEBPACK_IMPORTED_MODULE_2__[\"services\"].getSampleInfo(params).then(function (res) {\n      var data = res.data;\n      state.loading = false;\n\n      if (data.err_code == 0) {\n        state.ypGoodDetail = data.data;\n      } else {\n        Object(vant__WEBPACK_IMPORTED_MODULE_1__[\"Toast\"])(data.err_msg);\n      }\n    }).catch(function (err) {\n      state.loading = false;\n    });\n  }\n};\nvar getters = {};\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n  state: state,\n  mutations: mutations,\n  actions: actions,\n  getters: getters\n});\n\n//# sourceURL=webpack:///./src/store/modules/sample/sampleapply.js?");
 
 
 /***/ }),
 /***/ }),