mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级弹窗

Browse Source
This commit is contained in:
jia 2023-09-13 10:01:41 +08:00
parent 65d6783046
commit 7581b54540
5 changed files with 968 additions and 954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.js
View File

@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试 // let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
httpApi = 'https://shop.lihaink.cn' // 生产 // httpApi = 'https://shop.lihaink.cn' // 生产
// httpApi = "https://crmeb-test.shop.lihaink.cn" httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325" // httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325' // httpApi = 'http://192.168.0.108:8325'

2
pages/product/basicSet.vue
View File

@ -370,7 +370,7 @@
mer_avatar: this.images[1].img, mer_avatar: this.images[1].img,
mini_banner: this.images[2].img, mini_banner: this.images[2].img,
mer_certificate: this.images[3].img, mer_certificate: this.images[3].img,
delivery_way: this.delivery_way, delivery_way: [1,2],
mer_take_name: this.takeName, mer_take_name: this.takeName,
mer_take_phone: this.takePhone, mer_take_phone: this.takePhone,
mer_take_address: this.detailSite, mer_take_address: this.detailSite,

56
pages/product/list/index.vue
View File

@ -73,9 +73,9 @@
</div> </div>
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class='product_list' > <view class='product_list'>
<view v-for="(item,index) in productList" :key="index" style="position: relative;width: 100%;" > <view v-for="(item,index) in productList" :key="index" style="position: relative;width: 100%;">
<view class='item' @click="yinc"> <view class='item' @click="yinc">
<view class='image'> <view class='image'>
<image :src='item.image'></image> <image :src='item.image'></image>
<text v-if="item.spec_type == 1" class="spec">多规格</text> <text v-if="item.spec_type == 1" class="spec">多规格</text>
@ -105,13 +105,15 @@
@change="menuAction($event, item.attrValue,item)"> @change="menuAction($event, item.attrValue,item)">
. . . . . .
</rudon-rowMenuDotDotDot> --> </rudon-rowMenuDotDotDot> -->
<view class="" style='font-size: 30rpx;text-align: right;position: absolute; top: 0px; right: 10px;z-index: 999;"' <view class=""
style='font-size: 30rpx;text-align: right;position: absolute; top: 0px; right: 10px;z-index: 999;"'
@click="menuActiona(item,index)"> @click="menuActiona(item,index)">
<image src="@/static/images/dian.png" mode="aspectFill" style="width: 30rpx;height: 30rpx; <image src="@/static/images/dian.png" mode="aspectFill" style="width: 30rpx;height: 30rpx;
margin-top: 40rpx;"></image> margin-top: 40rpx;"></image>
</view> </view>
<view class="muau-header" v-if='index==num' style="position: absolute; top: 40rpx; right: 0px;"> <view class="muau-header" v-if='index==num'
style="position: absolute; top: 40rpx; right: 0px;">
<view class="muau" v-for='(kk,i) in options' <view class="muau" v-for='(kk,i) in options'
@click='menuAction(kk, item.attrValue,item,index)'> @click='menuAction(kk, item.attrValue,item,index)'>
<view class=""> <view class="">
@ -122,12 +124,13 @@
</view> </view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<!-- <view class="" class="bnt" @click="Fonline(item)" style="width:150rpx"> <!-- <view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
线上入库 线上入库
</view> --> </view> -->
<view class="" class="bnt" @click="Fline(item)" style="width:150rpx"> <view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
线下入库 线下入库
</view> </view>
<view v-if="item.is_show == 1 && item.status == 1" class="bnt" <view v-if="item.is_show == 1 && item.status == 1" class="bnt"
@tap.stop="handleShelves(item,0)">下架 @tap.stop="handleShelves(item,0)">下架
</view> </view>
@ -246,14 +249,14 @@
}, },
onLoad(options) { onLoad(options) {
this.mer_id = options.mer_id; this.mer_id = options.mer_id;
this.getList(this.mer_id); this.getList(this.mer_id,true);
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.where.page = 1 this.where.page = 1
this.productList = [] this.productList = []
this.loading = false this.loading = false
this.loaded = false this.loaded = false
this.getList(this.mer_id); this.getList(this.mer_id,false);
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onReachBottom() { onReachBottom() {
@ -261,11 +264,9 @@
if (this.status == 'nomore') return; if (this.status == 'nomore') return;
this.status = 'loading'; this.status = 'loading';
this.where.page = ++this.where.page; this.where.page = ++this.where.page;
this.getList(this.mer_id); this.getList(this.mer_id,true);
},
onHide() {
this.show = !this.show
}, },
methods: { methods: {
menuActiona(item, index) { menuActiona(item, index) {
if (item.is_good) { if (item.is_good) {
@ -348,13 +349,14 @@
this.checkboxList1 = item.attrValue this.checkboxList1 = item.attrValue
// console.log(this.checkboxList1.length)
if(this.checkboxList1.length>3){ if (this.checkboxList1.length > 0) {
this.show = true this.show = true
this.data.product_id = item.attrValue[0].product_id this.data.product_id = this.checkboxList1[0].product_id
this.data.unique = item.attrValue[0].unique this.data.unique = this.checkboxList1[0].unique
this.on_line = 1 this.on_line = 1
}else{ } else {
this.show = false
navigateTo(1, '/pages/users/online_warehousing/index', { navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id, mer_id: this.mer_id,
product_id: this.data.product_id, product_id: this.data.product_id,
@ -376,13 +378,16 @@
}) })
} else { } else {
postImport(this.mer_id, this.data).then(res => { postImport(this.mer_id, this.data).then(res => {
console.log(res); // console.log(res);
this.loading = false
this.loaded = false
this.getList(this.mer_id, true);
this.show = false this.show = false
this.$util.Tips({ this.$util.Tips({
title: res.message title: res.message
}) })
this.getList(this.mer_id);
}).catch(err => { }).catch(err => {
this.show = false this.show = false
this.$util.Tips({ this.$util.Tips({
@ -413,11 +418,11 @@
//规格 //规格
checkboxChange(n) { checkboxChange(n) {
this.data.unique = n this.data.unique = n
console.log(n);
}, },
radioChange(n) { radioChange(n) {
this.data.product_id = n.product_id this.data.product_id = n.product_id
console.log(this.data);
}, },
// 跳转添加商品界面 // 跳转添加商品界面
jumpAddGoods() { jumpAddGoods() {
@ -447,15 +452,20 @@
this.swiperCur = e.detail.current; this.swiperCur = e.detail.current;
} }
}, },
getList: function(mer_id) { getList: function(mer_id, ispage) {
var that = this; var that = this;
if (that.loading || that.loaded) return; if (that.loading || that.loaded) return;
that.loading = true; that.loading = true;
if (ispage) {
this.where.page=1
that.productList = []
}
productLstApi(mer_id, that.where).then( productLstApi(mer_id, that.where).then(
res => { res => {
that.loading = false; that.loading = false;
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.productList.push.apply(that.productList, res.data.list); // that.productList.push.apply(that.productList, res.data.list);
that.productList.push(...res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
}, },

4
pages/users/feedback/index.vue
View File

@ -230,6 +230,7 @@
}) })
return return
} }
feedback({ feedback({
type: this.qsArray[this.qsIndex].feedback_category_id, type: this.qsArray[this.qsIndex].feedback_category_id,
content: this.con, content: this.con,
@ -238,6 +239,9 @@
contact: this.phone contact: this.phone
}).then(res => { }).then(res => {
this.isShowbox = true this.isShowbox = true
uni.redirectTo({
url:'/pages/user/index'
})
}).catch(error => { }).catch(error => {
this.$util.Tips({ this.$util.Tips({
title: error title: error

8
store/modules/app.js
View File

@ -126,9 +126,9 @@ const actions = {
if (Object.keys(res.data.appInfo).length > 0) { if (Object.keys(res.data.appInfo).length > 0) {
if(res.data.appInfo.version) uni.showLoading({ // if(res.data.appInfo.version) uni.showLoading({
title: '检查更新中' // title: '检查更新中'
}) // })
// 版本更新 // 版本更新
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 && if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
@ -148,7 +148,7 @@ const actions = {
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }
uni.hideLoading(); // uni.hideLoading();
} }
} }