Skip to content

梁建民 / h5

Go to a project
Commit 1b99626e by 施宇
Options

地址的bug修复

parent c3ef0d6e
Expand all
Inline Side-by-side
Showing with 14 additions and 5 deletions
src/store/modules/sample/sampleapply.js
...@@ -18,8 +18,13 @@ const state = { ...@@ -18,8 +18,13 @@ const state = {
} }
const mutations = { const mutations = {
recvlistSample(state, payload) { recvlistSample(state, payload) {
if(!payload.data){
state.addressInfo = null
}else{
state.addressInfo=payload.data.filter(function(item){return item['is_default'] == 1;}); state.addressInfo=payload.data.filter(function(item){return item['is_default'] == 1;});
state.addressInfo=state.addressInfo[0]; state.addressInfo=state.addressInfo[0];
}
}, },
} }
...@@ -28,11 +33,17 @@ const actions = { ...@@ -28,11 +33,17 @@ const actions = {
Services.recvlist().then((res) => { Services.recvlist().then((res) => {
let data = res.data; let data = res.data;
// state.loading = false; // state.loading = false;
console.log(data.err_code)
if (data.err_code == 0) { if (data.err_code == 0) {
commit({ commit({
type: 'recvlistSample', type: 'recvlistSample',
data: data.data data: data.data
}); });
}else{
commit({
type: 'recvlistSample',
data: null
});
} }
}).catch(function (err) { }).catch(function (err) {
}); });
......
src/store/modules/user/address.js
...@@ -208,6 +208,7 @@ const actions = { ...@@ -208,6 +208,7 @@ const actions = {
setTimeout(function(){ setTimeout(function(){
if(payload.orderpg){ if(payload.orderpg){
history.go(-1); history.go(-1);
}else{ }else{
history.go(0); history.go(0);
} }
......
src/views/sample/sampleapply.vue
...@@ -385,7 +385,7 @@ export default { ...@@ -385,7 +385,7 @@ export default {
window.location.href = "/h5/view/#/userAddress?points=" + adderssId; window.location.href = "/h5/view/#/userAddress?points=" + adderssId;
}, },
adderssAdd() { adderssAdd() {
window.location.href = "/h5/view/#/userAddress?fp=5"; window.location.href = "/h5/view/#/userAddress";
}, },
}, },
components: { components: {
......
src/views/user/address.vue
...@@ -125,9 +125,6 @@ ...@@ -125,9 +125,6 @@
iso:this.$route.query.fp,//是否开启新增 iso:this.$route.query.fp,//是否开启新增
address_id_p:this.$route.query.address_id, address_id_p:this.$route.query.address_id,
zytp:this.$route.query.zyType, zytp:this.$route.query.zyType,
//编辑 //编辑
tips:"", tips:"",
edOrAdd:false, edOrAdd:false,
......
view/app.js
...@@ -4506,7 +4506,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core ...@@ -4506,7 +4506,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.11@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.9.0@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.4@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 ypComInfo: {},\n ypBasInfo: {},\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; // 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\n var params = payload.data;\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.goods_info || {};\n state.ypComInfo = data.data.company_info || {};\n state.ypBasInfo = data.data.user_info || {};\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.11@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.9.0@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.4@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 ypComInfo: {},\n ypBasInfo: {},\n ordernum: ''\n};\nvar mutations = {\n recvlistSample: function recvlistSample(state, payload) {\n if (!payload.data) {\n state.addressInfo = null;\n } else {\n state.addressInfo = payload.data.filter(function (item) {\n return item['is_default'] == 1;\n });\n state.addressInfo = state.addressInfo[0];\n }\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 console.log(data.err_code);\n\n if (data.err_code == 0) {\n commit({\n type: 'recvlistSample',\n data: data.data\n });\n } else {\n commit({\n type: 'recvlistSample',\n data: null\n });\n }\n }).catch(function (err) {});\n },\n selfSampleCreate: function selfSampleCreate(_ref2, payload) {\n var commit = _ref2.commit;\n state.loading = true; // 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\n var params = payload.data;\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.goods_info || {};\n state.ypComInfo = data.data.company_info || {};\n state.ypBasInfo = data.data.user_info || {};\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?");
/***/ }), /***/ }),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment