This commit is contained in:
parent
64b7a52d22
commit
1f13c5daf4
5
App.vue
5
App.vue
|
|
@ -427,6 +427,11 @@
|
|||
@import 'static/css/style.scss';
|
||||
|
||||
|
||||
// 全局取消滚动条
|
||||
* {
|
||||
scrollbar-color: #e5e5e500 #f7f7f9 !important;
|
||||
}
|
||||
|
||||
view {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ let httpApiThree
|
|||
let wsApi
|
||||
|
||||
// 在打包之前请检查当前环境是否正确
|
||||
// const env = 'dev'; // 开发
|
||||
const env = 'prod'; // 生产
|
||||
const env = 'dev'; // 开发
|
||||
// const env = 'prod'; // 生产
|
||||
// const env = 'prew'; // 预上线
|
||||
|
||||
switch (env) {
|
||||
|
|
|
|||
|
|
@ -211,7 +211,6 @@
|
|||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -252,9 +251,6 @@
|
|||
this.mer_id = user.service.mer_id;
|
||||
this.getSubsidy();
|
||||
this.getSubsidyRecord();
|
||||
// this.$nextTick(res=>{
|
||||
// this.$refs.pupRef.open();
|
||||
// })
|
||||
},
|
||||
onShow() {},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -117,9 +117,10 @@
|
|||
获取地址
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>提货点营业日期:</view>
|
||||
<view class="week_box">
|
||||
<view class="week_item" v-for="(item,index) in dateWeek" :key="index" @click="sel(item,index)">
|
||||
<view class="week_item" v-for="(item,index) in dateWeek" :key="index" @click="sel(index)">
|
||||
<view class="date_week" :class="item.isCheck ? 'date_week_a' : ''">
|
||||
{{ item.name }}
|
||||
</view>
|
||||
|
|
@ -284,7 +285,6 @@
|
|||
id: 7,
|
||||
isCheck: true
|
||||
}],
|
||||
selarr: [1, 2, 3, 4, 5, 6, 7],
|
||||
mer_take_time: ['08:00', '18:00'],
|
||||
beginTimeShow: false,
|
||||
overTimeShow: false,
|
||||
|
|
@ -340,15 +340,19 @@
|
|||
this.takeName = res.data.mer_take_name
|
||||
this.takePhone = res.data.mer_take_phone
|
||||
this.detailSite = res.data.mer_take_address
|
||||
// this.servicePhone = res.data.service_phone
|
||||
this.servicePhone = res.data.mer_phone;
|
||||
|
||||
res.data.mer_take_location ? this.longLati = res.data.mer_take_location?.join(',') : null;
|
||||
res.data.mer_take_day && res.data.mer_take_day.forEach((item, i) => {
|
||||
this.dateWeek[Number(item) - 1].isCheck = true
|
||||
})
|
||||
|
||||
this.selarr = res.data.mer_take_day;
|
||||
// 是否有营业日期
|
||||
if (res.data.mer_take_day && res.data.mer_take_day.length > 0) {
|
||||
this.dateWeek.forEach(item => {
|
||||
let day = res.data.mer_take_day.find(i => i == item.id);
|
||||
if (day) item.isCheck = true;
|
||||
else item.isCheck = false;
|
||||
})
|
||||
}
|
||||
|
||||
this.type_code = res.data.type_code
|
||||
this.mer_take_time = res.data.mer_take_time
|
||||
this.intro = res.data.mer_info
|
||||
|
|
@ -385,20 +389,13 @@
|
|||
//开启信用购
|
||||
change(e) {
|
||||
this.credit_buy = e
|
||||
console.log(e);
|
||||
},
|
||||
|
||||
// 选择营业日期
|
||||
sel(item, i) {
|
||||
if (item.isCheck == false) {
|
||||
item.isCheck = true;
|
||||
this.selarr.push(String(item.id));
|
||||
} else {
|
||||
item.isCheck = false;
|
||||
this.selarr = this.selarr.filter(id => {
|
||||
return id != item.id
|
||||
})
|
||||
}
|
||||
sel(i) {
|
||||
this.dateWeek[i].isCheck = !this.dateWeek[i].isCheck;
|
||||
},
|
||||
|
||||
postMerchantUpdata() {
|
||||
uni.showModal({
|
||||
title: '确定提交吗',
|
||||
|
|
@ -432,7 +429,7 @@
|
|||
lat: this.latitude,
|
||||
long: this.longitude,
|
||||
mer_take_location: [this.latitude, this.longitude], // 经纬度
|
||||
mer_take_day: this.selarr, // 提货点营业日期
|
||||
mer_take_day: [], // 提货点营业日期
|
||||
mer_take_time: this.mer_take_time, // 提货时间
|
||||
mer_info: this.intro,
|
||||
mer_keyword: this.cruxText,
|
||||
|
|
@ -446,35 +443,27 @@
|
|||
settle_cycle: this.settle_cycle,
|
||||
interest_rate: this.interest_rate
|
||||
}
|
||||
// 营业时间
|
||||
this.dateWeek.map(i => {
|
||||
if (i.isCheck) {
|
||||
data.mer_take_day.push(i.id)
|
||||
}
|
||||
})
|
||||
|
||||
merchantUpdateAPI(data).then(res => {
|
||||
Toast(res.message)
|
||||
setTimeout(() => {
|
||||
// uni.switchTab({
|
||||
// url: '/pages/moreProject/moreProject',
|
||||
// fail: (err) => {
|
||||
// // console.log('err', err);
|
||||
// }
|
||||
// });
|
||||
// uni.navigateTo({
|
||||
// url:'/pages/moreProject/moreProject'
|
||||
// })
|
||||
// uni.redirectTo({
|
||||
// url: '/pages/moreProject/moreProject'
|
||||
// })
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
uni.navigateBack();
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
Toast(err)
|
||||
})
|
||||
},
|
||||
selfLocation() {
|
||||
|
||||
selfLocation() {
|
||||
uni.getLocation({
|
||||
type: 'wgs84',
|
||||
success: (res) => {
|
||||
// console.log(res);
|
||||
this.latitude = res.latitude.toString();
|
||||
this.longitude = res.longitude.toString();
|
||||
this.longLati = `${res.latitude},${res.longitude}`
|
||||
|
|
@ -488,34 +477,8 @@
|
|||
seleckImage(i) {
|
||||
let that = this;
|
||||
that.$util.uploadImageOne('upload/image', function(res) {
|
||||
// console.log(res)
|
||||
that.images[i].img = res.data.path
|
||||
});
|
||||
// let that = this
|
||||
// uni.chooseImage({
|
||||
// count: 1,
|
||||
// sizeType: ['original', 'compressed'],
|
||||
// sourceType: ['album', 'camera'],
|
||||
// success: function(res) {
|
||||
|
||||
// uni.showLoading({
|
||||
// title: '上传中...'
|
||||
// })
|
||||
// console.log(res.tempFilePaths[0],'22222222');
|
||||
// uploads(res.tempFilePaths[0], 'img').then(res => {
|
||||
// console.log(res,'3333');
|
||||
// that.images[i].img = res
|
||||
// uni.hideLoading()
|
||||
// }).catch(err => {
|
||||
// Toast('添加失败')
|
||||
// uni.hideLoading()
|
||||
// })
|
||||
// },
|
||||
// fail: function(err) {
|
||||
// Toast('添加失败')
|
||||
// }
|
||||
// });
|
||||
|
||||
},
|
||||
seleckImageArr() {
|
||||
let that = this;
|
||||
|
|
@ -556,7 +519,6 @@
|
|||
navTo(url) {
|
||||
if (url == '/pages/select_address/select_address_n') {
|
||||
uni.$once('changeAddress', (res) => {
|
||||
// console.log('收到', res);
|
||||
this.mer_address = res.formatted_addresses.recommend;
|
||||
this.latitude = res.latitude;
|
||||
this.longitude = res.longitude;
|
||||
|
|
@ -570,8 +532,7 @@
|
|||
},
|
||||
onPullDownRefresh() {
|
||||
uni.stopPullDownRefresh()
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,25 +5,21 @@
|
|||
<view class="title_search">
|
||||
<span class="iconfont"></span>
|
||||
<form @submit="search" report-submit="true">
|
||||
<input type="text" :name="where.keyword" v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
|
||||
</form>
|
||||
<input type="text" :name="where.keyword" v-model="where.keyword" placeholder="搜索商品"
|
||||
confirm-type='search' />
|
||||
</form>
|
||||
</view>
|
||||
</view>
|
||||
<view class="longTab">
|
||||
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation class="menu" :scroll-left="tabLeft" show-scrollbar="true">
|
||||
<view
|
||||
class="longItem"
|
||||
:style="'width:' + isWidth + 'px'"
|
||||
:data-index="index"
|
||||
:class="index === tabClick ? 'click' : ''"
|
||||
v-for="(item, index) in menuList"
|
||||
:key="index"
|
||||
:id="'id' + index"
|
||||
@click="selectMenu(item, index)"
|
||||
>
|
||||
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation
|
||||
class="menu" :scroll-left="tabLeft" show-scrollbar="true">
|
||||
<view class="longItem" :style="'width:' + isWidth + 'px'" :data-index="index"
|
||||
:class="index === tabClick ? 'click' : ''" v-for="(item, index) in menuList" :key="index"
|
||||
:id="'id' + index" @click="selectMenu(item, index)">
|
||||
{{ item.name }}
|
||||
</view>
|
||||
<view v-if="menuList.length" class="underlineBox" :style="'transform:translateX(' + isLeft + 'px);width:' + isWidth + 'px'">
|
||||
<view v-if="menuList.length" class="underlineBox"
|
||||
:style="'transform:translateX(' + isLeft + 'px);width:' + isWidth + 'px'">
|
||||
<view class="underline bg-color-white"></view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
|
@ -46,26 +42,35 @@
|
|||
</view>
|
||||
<view class="shop_list_item_shop_con_price">
|
||||
<block v-if="mer_info.type_code=='TypeSupplyChain'">
|
||||
<block v-if="item.attrValue[0]">
|
||||
<text class='price font-color'>￥{{item.attrValue[0].wholesale_price}}</text>
|
||||
<text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
|
||||
</block>
|
||||
<text v-else class='ot_price'>商品规格错误</text>
|
||||
<block v-if="item.attrValue[0]">
|
||||
<text class='price font-color'>￥{{item.attrValue[0].wholesale_price}}</text>
|
||||
<text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
|
||||
</block>
|
||||
<text v-else class='ot_price'>商品规格错误</text>
|
||||
</block>
|
||||
<text v-else class='price font-color'>￥{{item.price}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="shop_list_item_handle">
|
||||
<view v-if="item.is_show == 1 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">下架</view>
|
||||
<view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">上架</view>
|
||||
<view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">删除</view>
|
||||
<view v-if="item.is_show == 1 && item.status == 1 && type != 5" class="shop_button"
|
||||
@click="upperShelfAndLowerShelf(item, index)">下架</view>
|
||||
<view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button"
|
||||
@click="upperShelfAndLowerShelf(item, index)">上架</view>
|
||||
<view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">
|
||||
删除</view>
|
||||
<view class="shop_button" v-if="type == 5" @click="reduction(item, index)">恢复</view>
|
||||
<block v-if="type != 5">
|
||||
<navigator v-if="mer_info.type_code=='PersonalStore'" :url="`/pages/product/addGood/addGood_one?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
|
||||
<navigator v-else-if="mer_info.type_code=='TypeSupplyChain'" :url="`/pages/product/addGood/addGood_supply?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
|
||||
<navigator v-else :url="`/pages/product/addGood/addGood?mer_id=${merId}&product_id=${item.product_id}`" class="shop_button" hover-class="none">编辑</navigator>
|
||||
</block>
|
||||
<navigator v-if="mer_info.type_code=='PersonalStore'"
|
||||
:url="`/pages/product/addGood/addGood_one?mer_id=${merId}&product_id=${item.product_id}`"
|
||||
class="shop_button" hover-class="none">编辑</navigator>
|
||||
<navigator v-else-if="mer_info.type_code=='TypeSupplyChain'"
|
||||
:url="`/pages/product/addGood/addGood_supply?mer_id=${merId}&product_id=${item.product_id}`"
|
||||
class="shop_button" hover-class="none">编辑</navigator>
|
||||
<navigator v-else
|
||||
:url="`/pages/product/addGood/addGood?mer_id=${merId}&product_id=${item.product_id}`"
|
||||
class="shop_button" hover-class="none">编辑</navigator>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -76,159 +81,182 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
productLstApi,
|
||||
productTitle,
|
||||
productDeleteApi,
|
||||
productOffApi,
|
||||
productRestore,
|
||||
productDestory
|
||||
} from 'api/product.js';
|
||||
|
||||
import { productLstApi, productTitle, productDeleteApi, productOffApi, productRestore, productDestory } from 'api/product.js';
|
||||
import Loading from '@/components/Loading/index.vue';
|
||||
|
||||
import Loading from '@/components/Loading/index.vue';
|
||||
import {
|
||||
Toast,
|
||||
Modal,
|
||||
navigateTo,
|
||||
getStorage,
|
||||
removeStorage
|
||||
} from 'libs/uniApi.js';
|
||||
|
||||
import { Toast, Modal, navigateTo,getStorage, removeStorage } from 'libs/uniApi.js';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
Loading
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
type: 1,
|
||||
tabClick: 0,
|
||||
tabLeft: 0,
|
||||
isLeft: 0, //导航栏下划线位置
|
||||
isWidth: 0, //每个导航栏占位
|
||||
childIndex: 0,
|
||||
menuList: [],
|
||||
merId: '',
|
||||
mer_info: {},
|
||||
shopList: [],
|
||||
loaded: false,
|
||||
loading: false,
|
||||
where: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
keyword: '',
|
||||
},
|
||||
|
||||
canNotReade: true
|
||||
};
|
||||
},
|
||||
created() {
|
||||
var that = this;
|
||||
// 获取设备宽度
|
||||
uni.getSystemInfo({
|
||||
success(e) {
|
||||
that.isWidth = e.windowWidth / 5;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onLoad(opt) {
|
||||
let user = this.$store.state.app.userInfo;
|
||||
if(typeof user == 'string') user = JSON.parse(user);
|
||||
this.mer_info = user.mer_info;
|
||||
this.merId = opt.mer_id;
|
||||
this.getProductTitle();
|
||||
this.$set(this, 'type', opt.type ? Number(opt.type) : 1);
|
||||
this.initData();
|
||||
},
|
||||
onShow() {},
|
||||
// 下拉到底部
|
||||
onReachBottom() {
|
||||
this.initData();
|
||||
},
|
||||
methods: {
|
||||
initData() {
|
||||
var that = this;
|
||||
if (that.loading || that.loaded) return;
|
||||
that.loading = true;
|
||||
productLstApi(this.merId, { ...this.where, type: this.type }).then(
|
||||
res => {
|
||||
that.loading = false;
|
||||
that.loaded = res.data.list.length < that.where.limit;
|
||||
that.shopList.push.apply(that.shopList, res.data.list);
|
||||
that.where.page = that.where.page + 1;
|
||||
export default {
|
||||
components: {
|
||||
Loading
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
type: 1,
|
||||
tabClick: 0,
|
||||
tabLeft: 0,
|
||||
isLeft: 0, //导航栏下划线位置
|
||||
isWidth: 0, //每个导航栏占位
|
||||
childIndex: 0,
|
||||
menuList: [],
|
||||
merId: '',
|
||||
mer_info: {},
|
||||
shopList: [],
|
||||
loaded: false,
|
||||
loading: false,
|
||||
where: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
keyword: '',
|
||||
},
|
||||
error => {
|
||||
that.$util.Tips({
|
||||
title: error.msg
|
||||
});
|
||||
|
||||
canNotReade: true
|
||||
};
|
||||
},
|
||||
created() {
|
||||
var that = this;
|
||||
// 获取设备宽度
|
||||
uni.getSystemInfo({
|
||||
success(e) {
|
||||
that.isWidth = e.windowWidth / 5;
|
||||
}
|
||||
);
|
||||
},
|
||||
search(){
|
||||
let that = this;
|
||||
that.loading = that.loaded = false;
|
||||
that.where.page = 1;
|
||||
that.shopList = [];
|
||||
that.initData();
|
||||
},
|
||||
// 获取列表头部
|
||||
getProductTitle() {
|
||||
productTitle(this.merId).then(res => {
|
||||
this.menuList = res.data;
|
||||
let clickIndex = 1;
|
||||
this.menuList.forEach((item, index) => {
|
||||
if (item.type == this.type) {
|
||||
clickIndex = index;
|
||||
}
|
||||
});
|
||||
this.setMenuLeft(clickIndex);
|
||||
});
|
||||
},
|
||||
// 点击列表头部
|
||||
selectMenu(item, index) {
|
||||
this.type = item.type;
|
||||
this.loading = this.loaded = false;
|
||||
this.where.page = 1;
|
||||
this.shopList = [];
|
||||
this.setMenuLeft(index);
|
||||
},
|
||||
/*导航栏移动位置*/
|
||||
setMenuLeft(index) {
|
||||
this.childIndex = 0;
|
||||
if (this.menuList.length > 5) {
|
||||
var tempIndex = index - 2;
|
||||
tempIndex = tempIndex <= 0 ? 0 : tempIndex;
|
||||
let tabLeft = (index - 2) * this.isWidth; //设置下划线位置
|
||||
this.$nextTick(function() {
|
||||
this.$set(this, 'tabLeft', tabLeft);
|
||||
});
|
||||
}
|
||||
this.tabClick = index; //设置导航点击了哪一个
|
||||
this.isLeft = index * this.isWidth; //设置下划线位置
|
||||
|
||||
onLoad(opt) {
|
||||
let user = this.$store.state.app.userInfo;
|
||||
if (typeof user == 'string') user = JSON.parse(user);
|
||||
this.mer_info = user.mer_info;
|
||||
this.merId = opt.mer_id;
|
||||
this.getProductTitle();
|
||||
this.$set(this, 'type', opt.type ? Number(opt.type) : 1);
|
||||
this.initData();
|
||||
},
|
||||
//还原
|
||||
reduction(item, index) {
|
||||
Modal('温馨提示', `商品"${item.store_name}"，将被还原，请问是否继续`).then(() => {
|
||||
productRestore(this.merId, item.product_id).then(res => {
|
||||
this.$util.Tips({ title: res.message, icon: 'success' });
|
||||
this.shopList.splice(index, 1);
|
||||
onShow() {},
|
||||
// 下拉到底部
|
||||
onReachBottom() {
|
||||
this.initData();
|
||||
},
|
||||
methods: {
|
||||
initData() {
|
||||
var that = this;
|
||||
if (that.loading || that.loaded) return;
|
||||
that.loading = true;
|
||||
productLstApi(this.merId, {
|
||||
...this.where,
|
||||
type: this.type
|
||||
}).then(
|
||||
res => {
|
||||
that.loading = false;
|
||||
that.loaded = res.data.list.length < that.where.limit;
|
||||
that.shopList.push.apply(that.shopList, res.data.list);
|
||||
that.where.page = that.where.page + 1;
|
||||
},
|
||||
error => {
|
||||
that.$util.Tips({
|
||||
title: error.msg
|
||||
});
|
||||
}
|
||||
);
|
||||
},
|
||||
search() {
|
||||
let that = this;
|
||||
that.loading = that.loaded = false;
|
||||
that.where.page = 1;
|
||||
that.shopList = [];
|
||||
that.initData();
|
||||
},
|
||||
// 获取列表头部
|
||||
getProductTitle() {
|
||||
productTitle(this.merId).then(res => {
|
||||
this.menuList = res.data;
|
||||
let clickIndex = 1;
|
||||
this.menuList.forEach((item, index) => {
|
||||
if (item.type == this.type) {
|
||||
clickIndex = index;
|
||||
}
|
||||
});
|
||||
this.setMenuLeft(clickIndex);
|
||||
});
|
||||
});
|
||||
},
|
||||
editGoods(item) {
|
||||
// console.log(item);
|
||||
let waitDeleteData = [
|
||||
'addGoodsFormData',
|
||||
'singleSpecification',
|
||||
'attrValue',
|
||||
'modifyPriceData',
|
||||
'addGoodsSecoundData',
|
||||
'goodsDis',
|
||||
'editGoodsDetils',
|
||||
'canChange',
|
||||
'canChangeSecound'
|
||||
];
|
||||
waitDeleteData.forEach(item => {
|
||||
if (getStorage(item)) {
|
||||
removeStorage(item);
|
||||
},
|
||||
// 点击列表头部
|
||||
selectMenu(item, index) {
|
||||
this.type = item.type;
|
||||
this.loading = this.loaded = false;
|
||||
this.where.page = 1;
|
||||
this.shopList = [];
|
||||
this.setMenuLeft(index);
|
||||
},
|
||||
/*导航栏移动位置*/
|
||||
setMenuLeft(index) {
|
||||
this.childIndex = 0;
|
||||
if (this.menuList.length > 5) {
|
||||
var tempIndex = index - 2;
|
||||
tempIndex = tempIndex <= 0 ? 0 : tempIndex;
|
||||
let tabLeft = (index - 2) * this.isWidth; //设置下划线位置
|
||||
this.$nextTick(function() {
|
||||
this.$set(this, 'tabLeft', tabLeft);
|
||||
});
|
||||
}
|
||||
});
|
||||
navigateTo(1, '/pages/product/addGood/addGood', { mer_id: this.merId, type: 'edit', product_id: item.product_id, type: 'edit' });
|
||||
},
|
||||
// 加入回收站
|
||||
handleDelete(item, index) {
|
||||
item.is_del == 1
|
||||
? Modal('温馨提示', `商品"${item.store_name}"将被删除，请问是否继续?`).then(res => {
|
||||
this.tabClick = index; //设置导航点击了哪一个
|
||||
this.isLeft = index * this.isWidth; //设置下划线位置
|
||||
this.initData();
|
||||
},
|
||||
//还原
|
||||
reduction(item, index) {
|
||||
Modal('温馨提示', `商品"${item.store_name}"，将被还原，请问是否继续`).then(() => {
|
||||
productRestore(this.merId, item.product_id).then(res => {
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success'
|
||||
});
|
||||
this.shopList.splice(index, 1);
|
||||
});
|
||||
});
|
||||
},
|
||||
editGoods(item) {
|
||||
// console.log(item);
|
||||
let waitDeleteData = [
|
||||
'addGoodsFormData',
|
||||
'singleSpecification',
|
||||
'attrValue',
|
||||
'modifyPriceData',
|
||||
'addGoodsSecoundData',
|
||||
'goodsDis',
|
||||
'editGoodsDetils',
|
||||
'canChange',
|
||||
'canChangeSecound'
|
||||
];
|
||||
waitDeleteData.forEach(item => {
|
||||
if (getStorage(item)) {
|
||||
removeStorage(item);
|
||||
}
|
||||
});
|
||||
navigateTo(1, '/pages/product/addGood/addGood', {
|
||||
mer_id: this.merId,
|
||||
type: 'edit',
|
||||
product_id: item.product_id,
|
||||
type: 'edit'
|
||||
});
|
||||
},
|
||||
// 加入回收站
|
||||
handleDelete(item, index) {
|
||||
item.is_del == 1 ?
|
||||
Modal('温馨提示', `商品"${item.store_name}"将被删除，请问是否继续?`).then(res => {
|
||||
productDestory(this.merId, item.product_id)
|
||||
.then(res => {
|
||||
this.shopList.splice(index, 1);
|
||||
|
|
@ -237,8 +265,8 @@ export default {
|
|||
.catch(rej => {
|
||||
Toast(`${rej}`);
|
||||
});
|
||||
})
|
||||
: Modal('温馨提示', `商品"${item.store_name}"将被加入回收站，请问是否继续?`).then(res => {
|
||||
}) :
|
||||
Modal('温馨提示', `商品"${item.store_name}"将被加入回收站，请问是否继续?`).then(res => {
|
||||
productDeleteApi(this.merId, item.product_id)
|
||||
.then(res => {
|
||||
this.shopList.splice(index, 1);
|
||||
|
|
@ -247,218 +275,244 @@ export default {
|
|||
.catch(rej => {
|
||||
Toast(`${rej}, 加入回收站失败`);
|
||||
});
|
||||
});
|
||||
},
|
||||
// 上架下架
|
||||
upperShelfAndLowerShelf(obj, index) {
|
||||
let status = obj.is_show == 1 ? 0 : 1;
|
||||
productOffApi(this.merId, obj.product_id, { status: status })
|
||||
.then(res => {
|
||||
this.$util.Tips({ title: res.message, icon: 'success' });
|
||||
this.shopList.splice(index, 1);
|
||||
})
|
||||
.catch(err => {
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
});
|
||||
},
|
||||
handleMethod(item, obj, index) {
|
||||
if (item.id == 1) {
|
||||
this.upperShelfAndLowerShelf(obj, index);
|
||||
return;
|
||||
}
|
||||
if (item.id == 2) {
|
||||
this.addToRecycleBin(obj, index);
|
||||
return;
|
||||
},
|
||||
// 上架下架
|
||||
upperShelfAndLowerShelf(obj, index) {
|
||||
let status = obj.is_show == 1 ? 0 : 1;
|
||||
productOffApi(this.merId, obj.product_id, {
|
||||
status: status
|
||||
})
|
||||
.then(res => {
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success'
|
||||
});
|
||||
this.shopList.splice(index, 1);
|
||||
})
|
||||
.catch(err => {
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
});
|
||||
},
|
||||
handleMethod(item, obj, index) {
|
||||
if (item.id == 1) {
|
||||
this.upperShelfAndLowerShelf(obj, index);
|
||||
return;
|
||||
}
|
||||
if (item.id == 2) {
|
||||
this.addToRecycleBin(obj, index);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import './scss/index.scss';
|
||||
.longTab {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
/* #ifdef H5 */
|
||||
padding-bottom: 20rpx;
|
||||
/* #endif */
|
||||
/* #ifdef MP */
|
||||
padding-top: 12rpx;
|
||||
padding-bottom: 12rpx;
|
||||
/* #endif */
|
||||
.longItem {
|
||||
height: 50upx;
|
||||
display: inline-block;
|
||||
line-height: 50upx;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
color: #282828;
|
||||
max-width: 160rpx;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
overflow-x: scroll;
|
||||
overflow-y: hidden;
|
||||
/*解决ios上滑动不流畅*/
|
||||
-webkit-overflow-scrolling: touch;
|
||||
@import './scss/index.scss';
|
||||
|
||||
&.click {
|
||||
font-weight: bold;
|
||||
.longTab {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
/* #ifdef H5 */
|
||||
padding-bottom: 20rpx;
|
||||
/* #endif */
|
||||
/* #ifdef MP */
|
||||
padding-top: 12rpx;
|
||||
padding-bottom: 12rpx;
|
||||
|
||||
/* #endif */
|
||||
.longItem {
|
||||
height: 50upx;
|
||||
display: inline-block;
|
||||
line-height: 50upx;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
color: #e93323;
|
||||
color: #282828;
|
||||
max-width: 160rpx;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
overflow-x: scroll;
|
||||
overflow-y: hidden;
|
||||
/*解决ios上滑动不流畅*/
|
||||
-webkit-overflow-scrolling: touch;
|
||||
|
||||
&.click {
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
color: #e93323;
|
||||
|
||||
.underline {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.underlineBox {
|
||||
height: 3px;
|
||||
width: 20%;
|
||||
display: flex;
|
||||
align-content: center;
|
||||
justify-content: center;
|
||||
transition: 0.5s;
|
||||
|
||||
.underline {
|
||||
opacity: 1;
|
||||
width: 60rpx;
|
||||
height: 4rpx;
|
||||
background-color: #e93323;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.underlineBox {
|
||||
height: 3px;
|
||||
width: 20%;
|
||||
display: flex;
|
||||
align-content: center;
|
||||
justify-content: center;
|
||||
transition: 0.5s;
|
||||
.title_search {
|
||||
background: #f5f5f5;
|
||||
border-radius: 30rpx;
|
||||
height: 60rpx;
|
||||
padding-left: 60rpx;
|
||||
position: relative;
|
||||
|
||||
.underline {
|
||||
width: 60rpx;
|
||||
height: 4rpx;
|
||||
background-color: #e93323;
|
||||
.iconfont {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
margin-top: -14rpx;
|
||||
left: 30rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
input {
|
||||
height: 60rpx;
|
||||
font-size: 26rpx;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.title_search {
|
||||
background: #f5f5f5;
|
||||
border-radius: 30rpx;
|
||||
height: 60rpx;
|
||||
padding-left: 60rpx;
|
||||
position: relative;
|
||||
.iconfont {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
margin-top: -14rpx;
|
||||
left: 30rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
input {
|
||||
height: 60rpx;
|
||||
font-size: 26rpx;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
.shop_button {
|
||||
margin-left: 18rpx;
|
||||
padding: 0 34rpx;
|
||||
height: 60rpx;
|
||||
border: 1px solid #c7c7c7;
|
||||
border-radius: 30px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 30rpx;
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
}
|
||||
.shop_list {
|
||||
margin-top: 20rpx;
|
||||
padding: 0 20rpx;
|
||||
|
||||
&_item {
|
||||
padding: 30rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 20rpx;
|
||||
&_shop {
|
||||
display: flex;
|
||||
&_image,
|
||||
uni-image {
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
border-radius: 16rpx;
|
||||
position: relative;
|
||||
image {
|
||||
.shop_button {
|
||||
margin-left: 18rpx;
|
||||
padding: 0 34rpx;
|
||||
height: 60rpx;
|
||||
border: 1px solid #c7c7c7;
|
||||
border-radius: 30px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 30rpx;
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.shop_list {
|
||||
margin-top: 20rpx;
|
||||
padding: 0 20rpx;
|
||||
|
||||
&_item {
|
||||
padding: 30rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
&_shop {
|
||||
display: flex;
|
||||
|
||||
&_image,
|
||||
uni-image {
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
}
|
||||
}
|
||||
position: relative;
|
||||
.spec {
|
||||
color: #ffffff;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border-radius: 16rpx 0 16rpx 0;
|
||||
text-align: center;
|
||||
font-size: 18rpx;
|
||||
display: inline-block;
|
||||
width: 84rpx;
|
||||
line-height: 30rpx;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
&_con {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-left: 20rpx;
|
||||
padding-bottom: 12rpx;
|
||||
border-radius: 16rpx;
|
||||
position: relative;
|
||||
|
||||
&_title {
|
||||
font-size: 28rpx;
|
||||
color: #282828;
|
||||
max-width: 500rpx;
|
||||
padding-top: 4rpx;
|
||||
}
|
||||
&_message {
|
||||
margin-top: 15rpx;
|
||||
font-size: 22rpx;
|
||||
color: #868686;
|
||||
> span:nth-child(1) {
|
||||
display: inline-block;
|
||||
margin-right: 20rpx;
|
||||
image {
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
}
|
||||
}
|
||||
|
||||
&_price {
|
||||
margin-top: 10rpx;
|
||||
> span {
|
||||
display: inline-block;
|
||||
margin-right: 7rpx;
|
||||
font-size: 30rpx;
|
||||
color: #e93323;
|
||||
position: relative;
|
||||
|
||||
.spec {
|
||||
color: #ffffff;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border-radius: 16rpx 0 16rpx 0;
|
||||
text-align: center;
|
||||
font-size: 18rpx;
|
||||
display: inline-block;
|
||||
width: 84rpx;
|
||||
line-height: 30rpx;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
&_con {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-left: 20rpx;
|
||||
padding-bottom: 12rpx;
|
||||
|
||||
&_title {
|
||||
font-size: 28rpx;
|
||||
color: #282828;
|
||||
max-width: 500rpx;
|
||||
padding-top: 4rpx;
|
||||
}
|
||||
> del {
|
||||
|
||||
&_message {
|
||||
margin-top: 15rpx;
|
||||
font-size: 22rpx;
|
||||
color: #868686;
|
||||
|
||||
>span:nth-child(1) {
|
||||
display: inline-block;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
&_price {
|
||||
margin-top: 10rpx;
|
||||
|
||||
>span {
|
||||
display: inline-block;
|
||||
margin-right: 7rpx;
|
||||
font-size: 30rpx;
|
||||
color: #e93323;
|
||||
}
|
||||
|
||||
>del {
|
||||
color: #bebebe;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.ot_price {
|
||||
color: #bebebe;
|
||||
font-size: 26rpx;
|
||||
margin-left: 10rpx;
|
||||
// text-decoration: line-through;
|
||||
}
|
||||
}
|
||||
.ot_price {
|
||||
color: #bebebe;
|
||||
font-size: 26rpx;
|
||||
margin-left: 10rpx;
|
||||
// text-decoration: line-through;
|
||||
}
|
||||
}
|
||||
}
|
||||
&_handle {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
> view {
|
||||
margin-left: 18rpx;
|
||||
padding: 0 34rpx;
|
||||
height: 60rpx;
|
||||
border: 1px solid #c7c7c7;
|
||||
border-radius: 30px;
|
||||
|
||||
&_handle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 30rpx;
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
justify-content: flex-end;
|
||||
|
||||
>view {
|
||||
margin-left: 18rpx;
|
||||
padding: 0 34rpx;
|
||||
height: 60rpx;
|
||||
border: 1px solid #c7c7c7;
|
||||
border-radius: 30px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 30rpx;
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -194,6 +194,18 @@
|
|||
</view>
|
||||
</view>
|
||||
</u-action-sheet>
|
||||
|
||||
|
||||
<!-- 自定义弹框显示 -->
|
||||
<u-transition :show="modalShow">
|
||||
<view class="modal-wrap">
|
||||
<view class="modal">
|
||||
<view>认证失败</view>
|
||||
<view>请检查“姓名”,“身份证”,“银行卡”,“手机号码”是否正确</view>
|
||||
<view>当日剩余认证次数({{errorCount}})次</view>
|
||||
</view>
|
||||
</view>
|
||||
</u-transition>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -208,6 +220,7 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
modalShow: false,
|
||||
list: [],
|
||||
show: false,
|
||||
bankList: [], //银行列表
|
||||
|
|
@ -226,7 +239,8 @@
|
|||
icon: ''
|
||||
},
|
||||
mer_id: '',
|
||||
isCompany: ''
|
||||
isCompany: '',
|
||||
errorCount: 0
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -237,6 +251,7 @@
|
|||
}
|
||||
if (opt.mer_id) {
|
||||
this.mer_id = opt.mer_id;
|
||||
|
||||
if (opt.hasOwnProperty('isOwn') && (opt.isOwn === 0 || opt.isOwn == '0')) {
|
||||
this.list = [{
|
||||
name: '对公账户'
|
||||
|
|
@ -262,7 +277,7 @@
|
|||
}]
|
||||
}
|
||||
|
||||
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户
|
||||
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company = 0 个体户
|
||||
const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
|
||||
this.isCompany = isCompany;
|
||||
if (isCompany != 1) {
|
||||
|
|
@ -374,9 +389,12 @@
|
|||
title: '请输入正确的手机号！'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
let that = this;
|
||||
uni.showLoading({
|
||||
title: "绑定中..."
|
||||
})
|
||||
addBank(this.mer_id, this.bindForm).then(res => {
|
||||
uni.hideLoading()
|
||||
this.$util.Tips({
|
||||
title: '提交成功,请等待后台审核！'
|
||||
}, () => {
|
||||
|
|
@ -385,11 +403,20 @@
|
|||
})
|
||||
});
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
title: err,
|
||||
duration: 3000,
|
||||
icon: "none"
|
||||
})
|
||||
uni.hideLoading()
|
||||
if (isNaN(err)) {
|
||||
uni.showToast({
|
||||
title: err,
|
||||
icon: "none",
|
||||
duration: 3000
|
||||
})
|
||||
} else {
|
||||
this.errorCount = err;
|
||||
that.modalShow = true;
|
||||
setTimeout(() => {
|
||||
that.modalShow = false;
|
||||
}, 3000)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
|
@ -678,4 +705,30 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.modal-wrap {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
pointer-events: none;
|
||||
|
||||
.modal {
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
padding: 20rpx 30rpx;
|
||||
background: rgba(0, 0, 0, .7);
|
||||
max-width: 60%;
|
||||
border-radius: 10rpx;
|
||||
|
||||
view {
|
||||
line-height: 32rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
</view>
|
||||
<view class="audit-info-txt" v-if="item.is_check == 2">审核不通过：{{item.fail_msg}}</view>
|
||||
<view style="text-align: right;color:#46B03A;font-weight: bold;" v-if="item.is_check == 2"
|
||||
@click="handleToUpdate(item.id)">
|
||||
@click="handleToUpdate(item)">
|
||||
去修改
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -97,9 +97,16 @@
|
|||
|
||||
methods: {
|
||||
// 修改
|
||||
handleToUpdate(id) {
|
||||
handleToUpdate(item) {
|
||||
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户
|
||||
const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
|
||||
if (isCompany != 1 && item.is_own === 0) return;
|
||||
|
||||
let strUrl = "?mer_id=" + this.mer_id;
|
||||
strUrl += "&id=" + item.id
|
||||
|
||||
uni.redirectTo({
|
||||
url: "/pages/withdrawal/add?id=" + id
|
||||
url: "/pages/withdrawal/add" + strUrl
|
||||
})
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue