Skip to content

I
integral-mall
Commit b579278c by damodmg
Options

更新

parent 717713f2
Showing with 13 additions and 6 deletions
dist/index.html
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {}); gio('init','8be12240a3749eab', {});
//custom page code begin here //custom page code begin here
//custom page code end here //custom page code end here
gio('send');</script><link href=./static/css/app.421c8e892797f04ef71e53e7256daae7.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.12879679b2536395874b.js></script></body></html> gio('send');</script><link href=./static/css/app.7fb1b08f85eda51d7a0b493b5fa30860.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.3cc4d99b8da6193a6df5.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/app.12879679b2536395874b.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.3cc4d99b8da6193a6df5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/store/store-area.vue
...@@ -182,6 +182,9 @@ export default { ...@@ -182,6 +182,9 @@ export default {
let selectProvince = this.areaList.filter(v => { let selectProvince = this.areaList.filter(v => {
return v.isCheck && !v.indeterminate; return v.isCheck && !v.indeterminate;
}); });
for (let item of selectProvince) {
item.type = 0;
}
//获取市选中的 //获取市选中的
let cityList = this.areaList.filter(v => { let cityList = this.areaList.filter(v => {
return v.isCheck && v.indeterminate; return v.isCheck && v.indeterminate;
...@@ -189,6 +192,7 @@ export default { ...@@ -189,6 +192,7 @@ export default {
let selectCity = []; let selectCity = [];
for (let item of cityList) { for (let item of cityList) {
for (let v of item.children) { for (let v of item.children) {
v.type = 1;
if (v.isCheck) { if (v.isCheck) {
selectCity.push(v); selectCity.push(v);
} }
...@@ -197,7 +201,7 @@ export default { ...@@ -197,7 +201,7 @@ export default {
let selectList = selectProvince.concat(selectCity); let selectList = selectProvince.concat(selectCity);
let selectArr = []; let selectArr = [];
selectList.forEach(element => { selectList.forEach(element => {
selectArr.push({ id: element.id, label: element.label }); selectArr.push({ id: element.id, label: element.label, type: element.type });
}); });
if (selectArr.length < 1) { if (selectArr.length < 1) {
this.$message.error('请至少选择一个区域'); this.$message.error('请至少选择一个区域');
......
src/components/store/store.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<store-part v-if="storeType === 3" :selectData="selectData" @getSelectList="getSelectList"></store-part> <store-part v-if="storeType === 3" :selectData="selectData" @getSelectList="getSelectList"></store-part>
<div v-if="storeType === 4"> <div v-if="storeType === 4">
<div class="upload-box"> <div class="upload-box">
<el-upload :action="action" :data="uploadData" :before-upload="uploadFileBefore" :on-success="uploadFile" :show-file-list="showList" class="upload-content"> <el-upload :action="action" :data="uploadData" with-credentials :before-upload="uploadFileBefore" :on-success="uploadFile" :show-file-list="showList" class="upload-content">
<el-button size="small" plain class="upload-btn"><i class="iconfont icon-shangchuan"></i>点击上传</el-button> <el-button size="small" plain class="upload-btn"><i class="iconfont icon-shangchuan"></i>点击上传</el-button>
</el-upload> </el-upload>
<el-button type="text" class="download-btn" @click="downLoad">点击下载模板</el-button> <el-button type="text" class="download-btn" @click="downLoad">点击下载模板</el-button>
......
src/views/goods/gift/info.vue
...@@ -420,8 +420,8 @@ export default { ...@@ -420,8 +420,8 @@ export default {
refundType: [{ required: true, message: '请选择售后方式', trigger: 'change' }] refundType: [{ required: true, message: '请选择售后方式', trigger: 'change' }]
}, },
refundTypeStatus: false, refundTypeStatus: false,
// uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall', uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall', // uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
headersUpload: { headersUpload: {
sign: '' sign: ''
}, },
...@@ -1673,6 +1673,9 @@ export default { ...@@ -1673,6 +1673,9 @@ export default {
pickUpPointType:this.giftForm.changeTypeList.indexOf('4') != -1?this.pickUpPointType:"",//门店自提数据 pickUpPointType:this.giftForm.changeTypeList.indexOf('4') != -1?this.pickUpPointType:"",//门店自提数据
pickUpPointExtra:this.giftForm.changeTypeList.indexOf('4') != -1?JSON.stringify(this.selectedStoreData):""//门店自提数据 pickUpPointExtra:this.giftForm.changeTypeList.indexOf('4') != -1?JSON.stringify(this.selectedStoreData):""//门店自提数据
}; };
if(this.pickUpPointType===4) {
param.pickUpPointStr = this.pickUpPointStr
}
// 门店分类 // 门店分类
if(this.useNewStoreWidget===0) { if(this.useNewStoreWidget===0) {
if (this.sendChildData.storeType === 1) { if (this.sendChildData.storeType === 1) {
......
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 to comment