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-09 22:10:36 +08:00
parent dbd29fa2e2
commit e99ac5c912
15 changed files with 1379 additions and 1259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
App.vue
View File

@ -76,8 +76,15 @@
onLaunch: function(option) { onLaunch: function(option) {
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid; this.globalData.uid = this.$store.state.app.uid;
let appkey = uni.getStorage({
this.$store.dispatch('INIT_CONFIG'); key: 'launchFlag'
})
if (appkey) {
setTimeout(() => {
this.$store.dispatch('INIT_CONFIG');
}, 6000)
}
// #ifdef APP-PLUS // #ifdef APP-PLUS
//监听uni小程序发送的事件 //监听uni小程序发送的事件
@ -204,10 +211,11 @@
this.checknetwork()
}, },
onShow() { onShow() {
let that = this let that = this
// 记录H5和公众号 // 记录H5和公众号
if (this.$store.state.app.token) { if (this.$store.state.app.token) {

8
api/user.js
View File

@ -9,6 +9,14 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import request from "@/utils/request.js"; import request from "@/utils/request.js";
import Cache from '@/utils/cache' import Cache from '@/utils/cache'
/**
* 获取版本信息
*/
export function Appversion(data) {
return request.get(`app/version`, data, {
noAuth: true
});
}
/** /**
* 提交提现 * 提交提现
*/ */

4
config/app.js
View File

@ -24,8 +24,8 @@ if (process.env.NODE_ENV === "development") {
// httpApiThree = 'baseUrlTest' // h5跨域配置 // httpApiThree = 'baseUrlTest' // h5跨域配置
// #endif // #endif
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {
httpApi = 'https://shop.lihaink.cn' // 生产 // httpApi = 'https://shop.lihaink.cn' // 生产
//httpApi = "https://crmeb-test.shop.lihaink.cn" httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
} }

126
pages/commissionedSales/addDelegation/index.vue
View File

@ -1,25 +1,29 @@
<template> <template>
<view class="content"> <!-- #ifdef APP || H5 -->
<view>
<!-- #endif -->
<form @submit="formSubmit" report-submit='true'> <form @submit="formSubmit" report-submit='true'>
<view class="release_content"> <view class="release_content">
<view class="release_item"> <view class="release_item">
<view class="release_item-one"> <view class="release_item-one">
<view class="item-one"> <view class="item-one">
被委托商家 被委托商家
</view> </view>
<e-select v-model="formData.entrust_mer_id" :options="options1" placeholder="选择选项"></e-select> <e-select v-model="formData.entrust_mer_id" :value='formData.entrust_mer_id' :options="options1" @change="change1"
placeholder="选择选项"></e-select>
</view> </view>
<view class="release_item-one"> <view class="release_item-one">
<view class="item-one"> <view class="item-one">
委托周期 委托周期
</view> </view>
<view class=""> <view class="" @click="calendar">
<input type="number" v-model="formData.entrust_day" /> <input type="number" v-model="formData.entrust_day" />
</view> </view>
<!-- <e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select> -->
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}}) <view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})
@ -29,7 +33,7 @@
<text v-if="productList.length == 0" class="text">选择产品</text> <text v-if="productList.length == 0" class="text">选择产品</text>
<view v-else class="text"> <view v-else class="text">
<image class="image" v-for="(item,index) in productList" :key="index" <image class="image" v-for="(item,index) in productList" :key="index"
:src="item.image || (item.spu && item.spu.image)"></image> :src="item.image"></image>
</view> </view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
@ -38,7 +42,7 @@
<view class="content_center-one" v-for="(item,i) in productList" :key="i"> <view class="content_center-one" v-for="(item,i) in productList" :key="i">
<view class="center-one"> <view class="center-one">
<view class="center-one-img"> <view class="center-one-img">
<image :src="item.image" mode=""></image> <image :src="item.image" mode="aspectFit"></image>
</view> </view>
<view class="center-one-txt"> <view class="center-one-txt">
<view class="one-txta"> <view class="one-txta">
@ -57,15 +61,22 @@
</view> </view>
</view> </view>
<button class="release_btn button" form-type="submit">提交</button> <button class="release_btn button" form-type="submit">发布</button>
</view> </view>
</form> </form>
<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
:showMonth="info.showMonth" @close="close" />
<!-- 提到的宝贝弹窗 --> <!-- 提到的宝贝弹窗 -->
<uni-popup ref="associated" type="bottom"> <uni-popup ref="associated" type="bottom">
<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated> <associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
@ -74,7 +85,9 @@
import eselect from '@/components/e-select/e-select.vue'; import eselect from '@/components/e-select/e-select.vue';
import { import {
supplychain, supplychain,
entrustchain entrustchain,
editentrust,
entrustdetail
} from '@/api/sale.js' } from '@/api/sale.js'
export default { export default {
components: { components: {
@ -85,8 +98,20 @@
return { return {
value1: 1, value1: 1,
value2: "", value2: "",
options1: [], options1: [{
text: "Shenzhen1",
value: 1
}, {
text: "Shenzhen2",
value: 2
}, {
text: "Shenzhen3",
value: 3
}],
date: 1,
productList: [], productList: [],
info: { info: {
startDate: '', startDate: '',
@ -97,14 +122,6 @@
selected: [], selected: [],
showMonth: false showMonth: false
}, },
formData: {
entrust_mer_id: '',
entrust_day: 0,
is_type: "4",
product_info: [],
content: ''
},
type: ''
}; };
}, },
computed: { computed: {
@ -114,39 +131,46 @@
onLoad(e) { onLoad(e) {
this.id = e.id; this.id = e.id;
this.type = e.type this.type = e.type
if (this.type) { if (this.type) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '编辑打折' title: '编辑打折'
}) })
} else { this.editlist(e.id)
} }
}, },
mounted() { mounted() {
this.list() this.list()
}, },
methods: { methods: {
change1(item) {
console.log(item);
},
list() { list() {
supplychain({ supplychain({
page: 1 page: 1
}).then((res => { }).then((res => {
for (let i in res.data.list) { for (let i in res.data.list) {
this.options1.push({ this.options1.push({
text: res.data.list[i].mer_name, text: res.data.list[i].mer_name,
value: res.data.list[i].mer_id value: res.data.list[i].mer_id
}) })
} }
// console.log(res) // console.log(res)
})) }))
}, },
editlist(id) {
entrustdetail(id).then((res) => {
this.formData.entrust_mer_id = res.data.entrust_mer_id
this.formData.entrust_day = res.data.entrust_day
this.productList = res.data.product_list
this.getProduct(res.data.product_list)
})
},
calendar() { calendar() {
@ -162,11 +186,11 @@
}, },
//获取商品信息 //获取商品信息
getProduct(data) { getProduct(data) {
console.log(data) this.formData.product_info=[]
if (data.length > 0) { if (data.length > 0) {
for (let i in data) { for (let i in data) {
this.formData.content+=data[i].store_name+',' this.formData.content += data[i].store_name + ','
this.formData.product_info.push({ this.formData.product_info.push({
product_attr_unique: data[i].product_attr_unique, product_attr_unique: data[i].product_attr_unique,
number: Number(data[i].number), number: Number(data[i].number),
@ -191,6 +215,38 @@
if (!value.entrust_mer_id) return that.$util.Tips({ if (!value.entrust_mer_id) return that.$util.Tips({
title: '请添加商家' title: '请添加商家'
}); });
this.type?
editentrust(this.id,value).then(res => {
if (res.status == '200') {
uni.hideLoading()
that.$util.Tips({
title: '编辑成功',
icon: 'success'
});
that.formData = {
entrust_mer_id: '',
entrust_day: 0,
is_type: "4",
product_info: []
}
uni.redirectTo({
url: '/pages/commissionedSales/initiateDelegation/index'
})
} else {
that.$util.Tips({
title: res.messge,
icon: 'success'
});
}
}).catch(err => {
return that.$util.Tips({
title: err
});
})
:
entrustchain(value).then(res => { entrustchain(value).then(res => {
if (res.status == '200') { if (res.status == '200') {
uni.hideLoading() uni.hideLoading()
@ -207,7 +263,7 @@
uni.redirectTo({ uni.redirectTo({
url: '/pages/commissionedSales/initiateDelegation/index' url: '/pages/commissionedSales/initiateDelegation/index'
}) })
} else { } else {
that.$util.Tips({ that.$util.Tips({
title: res.messge, title: res.messge,
@ -231,10 +287,6 @@
background: #F5F5F5; background: #F5F5F5;
} }
.content {
height: 100vh;
position: relative;
}
.release_content { .release_content {
@ -479,10 +531,6 @@
} }
.release_btn { .release_btn {
margin-top: 100rpx;
position: absolute;
bottom: 150rpx;
left: 50%;
margin-left: -347rpx;
} }
</style> </style>

143
pages/commissionedSales/delegation_details/index.vue
View File

@ -6,7 +6,8 @@
</view> </view>
<view class="content_top-two"> <view class="content_top-two">
<view class="top-two-one"> <view class="top-two-one">
待处理
{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
</view> </view>
<view class="top-two-two"> <view class="top-two-two">
2020-07-07 14:14:14 2020-07-07 14:14:14
@ -14,55 +15,35 @@
</view> </view>
</view> </view>
<view class="content_center"> <view class="content_center">
<view class="content_center-one"> <view class="content_center-one" v-for="(item,index) in objinfo.product_list">
<view class="center-one"> <view class="center-one">
<view class="center-one-img"> <view class="center-one-img">
<image src="../../annex/static/left.png" mode=""></image> <image :src="item.image[0]" mode="aspectFit"></image>
</view> </view>
<view class="center-one-txt"> <view class="center-one-txt">
<view class="one-txta"> <view class="one-txta">
良品铺子肉松饼1000g/箱 面... {{item.store_name}}
</view> </view>
<view class="one-txtb"> <view class="one-txtb">
<view class=""> <view class="">
委托价:¥<span>34.90</span> 委托价:¥<span>{{item.price}}</span>
</view> </view>
<view class=""> <view class="">
数量:100个 数量:{{item.number}}个
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="content_center-one">
<view class="center-one">
<view class="center-one-img">
<image src="../../annex/static/left.png" mode=""></image>
</view>
<view class="center-one-txt">
<view class="one-txta">
良品铺子肉松饼1000g/箱 面...
</view>
<view class="one-txtb">
<view class="">
委托价:¥<span>34.90</span>
</view>
<view class="">
数量:100个
</view>
</view>
</view>
</view>
</view>
<view class="content_center-two"> <view class="content_center-two">
<view class="center-two"> <view class="center-two">
<view class="center-twoa"> <view class="center-twoa">
委托方: 委托方:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 {{objinfo.mer_info.mer_name}}
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two">
@ -70,7 +51,7 @@
被委托方: 被委托方:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 {{objinfo.entrust_mer_info.mer_name}}
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two">
@ -78,7 +59,7 @@
委托周期: 委托周期:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 {{objinfo.entrust_day}}
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two">
@ -86,7 +67,7 @@
结算周期: 结算周期:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 {{objinfo.mer_info.settle_cycle}}
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two">
@ -94,7 +75,7 @@
结算利息: 结算利息:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 {{objinfo.mer_info.interest_rate}}%
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two">
@ -102,7 +83,8 @@
状态: 状态:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺
{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two">
@ -110,15 +92,15 @@
是否结束委托: 是否结束委托:
</view> </view>
<view class="center-twob"> <view class="center-twob">
通滩镇镇街店铺 {{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
</view> </view>
</view> </view>
<view class="center-two"> <view class="center-two" v-if="objinfo.entrust_finish_refusal">
<view class="center-twoa"> <view class="center-twoa">
拒绝原因: 拒绝原因:
</view> </view>
<view class="center-twob" style="text-align: left;"> <view class="center-twob" style="text-align: left;">
通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺 {{objinfo.entrust_finish_refusal}}
</view> </view>
</view> </view>
</view> </view>
@ -130,36 +112,89 @@
</view> </view>
<view class="content_bootm_one"> <view class="content_bootm_one" v-for="(item,i) in objinfo.product_list">
<view class="bootm_oneimg"> <view class="bootm_oneimg">
<image src="@/static/images/bg2.png" mode=""></image> <image :src="item.image[0]" mode="aspectFit"></image>
</view> </view>
<view class=""> <view class="">
良品铺子肉松饼1000g/箱 面包糕... {{item.store_name}}
</view>
</view>
<view class="content_bootm_one">
<view class="bootm_oneimg">
<image src="@/static/images/bg2.png" mode=""></image>
</view>
<view class="">
良品铺子肉松饼1000g/箱 面包糕...
</view> </view>
</view> </view>
</view> </view>
<button class="release_btn button" form-type="submit">发布</button> <button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button>
</view> </view>
</template> </template>
<script> <script>
import {} from '@/api/sale.js' import {
addEntrustCart,
entrustdetail
} from '@/api/sale.js'
export default {
data() {
return {
objinfo: {},
goodsData: [{
name: '我发起的',
name1: '委托销售商品',
type: 1,
src: require('@/static/images/wtbg1.png'),
img: require('@/static/images/wtt1.png')
},
{
name: '我收到的',
name1: '帮助销售商品',
type: 2,
src: require('@/static/images/wtbg2.png'),
img: require('@/static/images/wtt2.png')
}
],
type:0,
}
},
onLoad(e) {
this.list(e.id)
this.type=e.type
},
onShow() {
},
methods: {
list(id) {
entrustdetail(id).then((res) => {
this.objinfo = res.data
})
},
submit(item){
addEntrustCart({community_id:item.community_id}).then(res=>{
if(res.status==200){
this.$util.Tips({
title: res.message,
icon: 'success'
})
uni.navigateTo({
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
})
}
})
}
}
}
</script> </script>
<style lang="scss"> <style lang="scss">
.content { .content{
position: relative; position: relative;
} }
.content_top { .content_top {
height: 151rpx; height: 151rpx;
background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%); background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
@ -186,7 +221,7 @@
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
margin-top: 10rpx; margin-top: 10rpx;
} }
.top-two-two { .top-two-two {
@ -273,7 +308,7 @@
.center-twob { .center-twob {
width: 360rpx; width: 360rpx;
text-align: right; text-align: right;
word-wrap: break-word; word-wrap: break-word;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;
@ -331,8 +366,10 @@
color: #FFFFFF; color: #FFFFFF;
position: absolute; position: absolute;
left: 50%; left: 50%;
margin-left: -347rpx; margin-left:-347rpx;
position: fixed; position: fixed;
bottom: 100rpx; bottom: 100rpx;
} }
</style> </style>

228
pages/commissionedSales/initiateDelegation/index.vue
View File

@ -6,7 +6,7 @@
<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle> <cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
</view> </view>
<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 --> <!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
<view class="content-content" v-for="(item,i) in orderList" :key="i"> <view class="content-content" v-for="(item,i) in list" :key="i" >
<view class="content-one"> <view class="content-one">
<view class="content-one-img"> <view class="content-one-img">
@ -14,10 +14,10 @@
</view> </view>
<view class="content-one-txt"> <view class="content-one-txt">
<view class="one-txt-a"> <view class="one-txt-a">
{{item.title}} {{item.content}}
</view> </view>
<view class="one-txt-b"> <view class="one-txt-b">
委托周期:{{item.credit_buy}} 委托周期:{{item.day}}
</view> </view>
</view> </view>
</view> </view>
@ -25,79 +25,84 @@
<view class="content-two_one" v-if="item.mer_status==0"> <view class="content-two_one" v-if="item.mer_status==0">
<view class="content-two-edita"> <view class="content-two-edita" @click="order">
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" @click="soldEdit(item)"> <!-- <view class="contentgn_a" @click="soldEdit(item)">
处理 处理
</view>
<span></span>-->
<view class="contentgn_a" style="margin-left: 10rpx;" @click="Edit(item)">
编辑
</view> </view>
<span></span> <span></span>
<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)"> <view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
删除 删除
</view> </view>
<span></span> <span></span>
<view class="contentgn_b" @click="detaildetail(item)"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_oneq" v-if="item.mer_status==1"> <view class="content-two_oneq" v-if="item.type==2">
<view class="content-two-editb" @click="accepted"> <view class="content-two-editb" @click="accepted">
已接受 已接受
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" @click="closingorder"> <view class="contentgn_a" @click="closingorder">
结束委托 结束委托
</view> </view>
<span></span> <span></span>
<view class="contentgn_b" @click="detail"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.mer_status==2"> <view class="content-two_one" v-if="item.type==3">
<view class="content-two-editc" @click="declined"> <view class="content-two-editc" @click="declined">
已拒绝 已拒绝
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" click="deleteOrder(item)"> <view class="contentgn_a">
删除 删除
</view> </view>
<span></span> <span></span>
<view class="contentgn_b" @click="detail(item)"> <view class="contentgn_b">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==4"> <view class="content-two_one" v-if="item.type==4">
<view class="content-two-editd" @click="soldEdit"> <view class="content-two-editd" @click="soldEdit">
已完成 已完成
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" click="deleteOrder(item)"> <view class="contentgn_a">
删除 删除
</view> </view>
<span></span> <span></span>
<view class="contentgn_b" @click="detail(item)"> <view class="contentgn_b">
详情 详情
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="adddelegation" @click="addDelegation">
<view class="adddelegation-one"> <view v-if="orderList.length == 0 && this.where.page > 1">
<image src="@/static/images/delegation.png" mode=""></image>
</view>
<view class="adddelegation-two">
新增委托
</view>
</view>
<view v-if="orderList.length == 0">
<emptyPage title="暂无订单~"></emptyPage> <emptyPage title="暂无订单~"></emptyPage>
</view> </view>
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
<uni-popup ref="bindmobile" type="center" @click="close"> <uni-popup ref="bindmobile" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -109,16 +114,19 @@
委托申请处理 委托申请处理
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>{{obj.settle_cycle}}天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>{{obj.interest_rate}}%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation" @click="passDelete(obj)"> <view class="cancellation">
拒绝 拒绝
</view> </view>
<view class="determine" @click="passagree(obj)"> <view class="determine">
接受 接受
</view> </view>
</view> </view>
@ -128,6 +136,7 @@
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile1" type="center" @click="close"> <uni-popup ref="bindmobile1" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -147,11 +156,15 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile2" type="center" @click="close"> <uni-popup ref="bindmobile2" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -164,10 +177,13 @@
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation">
拒绝 拒绝
@ -195,15 +211,20 @@
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
拒绝原因： 拒绝原因：
<view class="" style="margin-top: 21rpx;"> <view class="" style="margin-top: 21rpx;">
<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" /> <textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
</view> </view>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="determine"> <view class="determine">
@ -221,43 +242,34 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {
entrustlist,
finishchain,
checkchain
} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
emptyPage, emptyPage
}, },
data() { data() {
return { return {
activeItem: "tabOne", activeItem: "tabOne",
status: 'loadmore',
tabTitle: "", tabTitle: "",
orderList: [], orderList: [],
where: { where: {
page: 1, page: 1,
limit: 10, limit: 10
type: 1,
status: 0
}, },
tabs: [{ tabs: [{
name: "tabOne", name: "tabOne",
label: '待处理', label: '待处理',
type: 0 type: '1'
}, },
{ {
name: "tabTwo", name: "tabTwo",
label: '已接受', label: '已接受',
type: 1 type: '2'
}, },
{ {
name: "tabThree", name: "tabThree",
label: '已拒绝', label: '已拒绝',
type: 2 type: '3'
}, },
], ],
@ -285,50 +297,38 @@
type: 4 type: 4
} }
], ]
obj: {}
} }
}, },
onLoad() { onLoad() {
this.tabTitle = this.tabs[0].name this.tabTitle = this.tabs[0].name
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
// console.log(this.tabs[0]) console.log(this.tabs[0])
}, },
mounted() { mounted() {
this.commislist()
}, },
methods: { methods: {
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.commislist()
},
nav(item) { nav(item) {
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/commissionedSales/delegation_details/index' // url: '/pages/commissionedSales/delegation_details/index'
// }) // })
}, },
//获取分类数据
commislist() {
entrustlist(this.where).then((res) => {
this.orderList.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
})
},
//选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
this.where.page = 1 this.where.page = 1
this.orderList=[]
this.where.status = e.type this.where.status = e.type
this.commislist() this.commislist()
}, },
//编辑委托
Edit(item) {
uni.navigateTo({
url: '/pages/commissionedSales/addDelegation/index?id=' + item.community_id + '&type=edit'
})
},
//新增委托 //新增委托
addDelegation() { addDelegation() {
uni.navigateTo({ uni.navigateTo({
@ -337,41 +337,60 @@
}, },
//管理弹窗 //管理弹窗
close() { close() {
console.log('1111111')
this.$refs.bindmobile.close() this.$refs.bindmobile.close()
this.$refs.bindmobile1.close() this.$refs.bindmobile1.close()
this.$refs.bindmobile2.close() this.$refs.bindmobile2.close()
this.$refs.bindmobile3.close() this.$refs.bindmobile3.close()
}, },
//提交订单
order(item){
if(item.mer_status==0&&entrust_order_id!=0){
uni.navigateTo({
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
})
}else{
this.$util.Tips({
title:'商家还没同意该订单',
icon: 'err'
})
}
},
//详情 //详情
detail() { detail(item) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/commissionedSales/delegation_details/index' url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
}) })
}, },
// 待处理 // 待处理
soldEdit(item) { soldEdit() {
this.obj = item
console.log(item)
this.$refs.bindmobile.open() this.$refs.bindmobile.open()
}, },
//已接受 //已接受
accepted() { accepted() {
this.$refs.bindmobile1.open()
}, },
//结束委托 //结束委托
closingorder() { closingorder() {
this.$refs.bindmobile1.open() this.$refs.bindmobile3.open()
// this.$refs.bindmobile3.open()
}, },
// 已拒绝 // 已拒绝
declined() { declined() {
// this.$refs.bindmobile2.open() this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
}, },
//删除订单 //删除订单
deleteOrder(item) { deleteOrder(item) {
checkchain(item.entrust_mer_id).then(res => { checkchain(item.community_id, {
status: 3
}).then(res => {
this.$util.Tips({ this.$util.Tips({
title: res.message, title: res.message,
icon: 'success' icon: 'success'
@ -387,7 +406,7 @@
}, },
//审核通过 拒绝 //审核通过 拒绝
passDelete(item) { passDelete(item) {
checkchain(item.entrust_mer_id, { checkchain(item.community_id, {
status: 2 status: 2
}).then((res) => { }).then((res) => {
this.$util.Tips({ this.$util.Tips({
@ -401,7 +420,7 @@
}, },
//审核通过 同意 //审核通过 同意
passagree(item) { passagree(item) {
checkchain(item.entrust_mer_id, { checkchain(item.community_id, {
status: 1 status: 1
}).then((res) => { }).then((res) => {
this.$util.Tips({ this.$util.Tips({
@ -419,56 +438,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content {
height: 100vh;
position: relative;
}
.content_top { .content_top {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.adddelegation {
width: 694rpx;
height: 95rpx;
background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
border-radius: 47rpx 47rpx 47rpx 47rpx;
opacity: 1;
display: flex;
position: fixed;
position: absolute;
bottom: 84rpx;
left: 50%;
margin-left: -347rpx;
.adddelegation-one {
width: 50rpx;
margin-right: 30rpx;
height: 50rpx;
margin-left: 242rpx;
margin-top: 21rpx;
image {
width: 50rpx;
height: 50rpx;
}
}
.adddelegation-two {
font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
margin-top: 25rpx;
}
}
.content_top { .content_top {
@ -664,11 +637,12 @@
} }
span { span {
width: 1px; width: 0px;
height: 30rpx; height: 30rpx;
opacity: 1; opacity: 1;
margin-top: 8rpx;
background-color: #cccccc; margin-top: 10rpx;
border: 2rpx solid #CCCCCC;
} }
@ -849,7 +823,7 @@
.entrust_bg-content { .entrust_bg-content {
position: absolute; position: absolute;
top: 304rpx; top: 404rpx;
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
@ -895,7 +869,7 @@
.bg-content_textarea { .bg-content_textarea {
width: 624rpx; width: 624rpx;
height: 242rpx; height: 152rpx;
padding: 25rpx 18rpx; padding: 25rpx 18rpx;
background: #F5F5F5; background: #F5F5F5;

277
pages/commissionedSales/receivedCommission/index.vue
View File

@ -5,8 +5,8 @@
<!--选项卡滑动切换--> <!--选项卡滑动切换-->
<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle> <cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
</view> </view>
<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
<view class="content-content" v-for="(item,i) in orderList" :key="i"> <view class="content-content" v-for="(item,i) in orderList" :key="i" @click="nav(item)">
<view class="content-one"> <view class="content-one">
<view class="content-one-img"> <view class="content-one-img">
@ -14,90 +14,102 @@
</view> </view>
<view class="content-one-txt"> <view class="content-one-txt">
<view class="one-txt-a"> <view class="one-txt-a">
{{item.title}} {{item.content}}
</view> </view>
<view class="one-txt-b"> <view class="one-txt-b">
委托周期:{{item.credit_buy}} 委托周期:{{item.entrust_day}}
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.mer_status==0"> <view class="content-two_one" v-if="item.mer_status==0">
<view class="content-two-edita"> <view class="content-two-edita" @click="order">
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" @click="soldEdit(item)"> <view class="contentgn_a">
处理 处理
</view> </view>
<span></span> <span></span>
<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)"> <!-- <view class="contentgn_a" style="margin-left: 10rpx;" @click="Edit(item)">
编辑
</view>
<span></span> -->
<!-- <view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
删除 删除
</view> </view>
<span></span> <span></span> -->
<view class="contentgn_b" @click="detaildetail(item)"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_oneq" v-if="item.mer_status==1"> <view class="content-two_oneq" v-if="item.type==2">
<view class="content-two-editb" @click="accepted"> <view class="content-two-editb" @click="accepted">
已接受 已接受
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" @click="closingorder"> <view class="contentgn_a" style="margin-left: 10rpx;"
v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
结束委托 结束委托
</view> </view>
<span></span> <span v-if="item.entrust_order_id>0&&item.mer_status==1"></span>
<view class="contentgn_b" @click="detail"> <view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
@click="order(item)">
去下单
</view>
<span v-if="item.entrust_order_id==0"></span>
<view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.mer_status==2"> <view class="content-two_one" v-if="item.type==3">
<view class="content-two-editc" @click="declined"> <view class="content-two-editc" @click="declined">
已拒绝 已拒绝
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" click="deleteOrder(item)"> <view class="contentgn_a">
删除 删除
</view> </view>
<span></span> <span></span>
<view class="contentgn_b" @click="detail(item)"> <view class="contentgn_b">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==4"> <view class="content-two_one" v-if="item.type==4">
<view class="content-two-editd" @click="soldEdit"> <view class="content-two-editd" @click="soldEdit">
已完成 已完成
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" click="deleteOrder(item)">
删除
</view>
<span></span>
<view class="contentgn_b" @click="detail(item)"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="adddelegation" @click="addDelegation">
<view class="adddelegation-one">
<image src="@/static/images/delegation.png" mode=""></image>
</view>
<view class="adddelegation-two">
新增委托
</view>
</view>
<view v-if="orderList.length == 0"> <view v-if="orderList.length == 0">
<emptyPage title="暂无订单~"></emptyPage> <emptyPage title="暂无订单~"></emptyPage>
</view> </view>
<u-loadmore :status="status" v-if="orderList.length >= where.limit" /> <u-loadmore :status="status" v-if="orderList.length >= where.limit" />
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
<uni-popup ref="bindmobile" type="center" @click="close"> <uni-popup ref="bindmobile" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -109,16 +121,19 @@
委托申请处理 委托申请处理
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>{{obj.settle_cycle}}天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>{{obj.interest_rate}}%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation" @click="passDelete(obj)"> <view class="cancellation">
拒绝 拒绝
</view> </view>
<view class="determine" @click="passagree(obj)"> <view class="determine">
接受 接受
</view> </view>
</view> </view>
@ -128,6 +143,7 @@
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile1" type="center" @click="close"> <uni-popup ref="bindmobile1" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -136,22 +152,27 @@
<view class="entrust_bga"> <view class="entrust_bga">
<view class="entrust_bg-content"> <view class="entrust_bg-content">
<view class="bg-content-a"> <view class="bg-content-a">
确定结束委托? <!-- 确定结束委托? -->
申请委托结束处理
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation" @click="close">
取消 取消
</view> </view>
<view class="determine"> <view class="determine" @click="deteragrss(obj)">
确定 确定
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile2" type="center" @click="close"> <uni-popup ref="bindmobile2" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -164,10 +185,13 @@
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation">
拒绝 拒绝
@ -195,15 +219,20 @@
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
拒绝原因： 拒绝原因：
<view class="" style="margin-top: 21rpx;"> <view class="" style="margin-top: 21rpx;">
<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" /> <textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
</view> </view>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="determine"> <view class="determine">
@ -221,43 +250,40 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import { import {} from '@/api/sale.js'
entrustlist,
finishchain,
checkchain
} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
emptyPage, emptyPage
}, },
data() { data() {
return { return {
obj: {},
activeItem: "tabOne", activeItem: "tabOne",
status: 'loadmore', status: 'loadmore',
activeItem: "tabOne",
tabTitle: "", tabTitle: "",
orderList: [], orderList: [],
where: { where: {
page: 1, page: 1,
limit: 10,
type: 2, type: 2,
limit: 10,
status: 0 status: 0
}, },
tabs: [{ tabs: [{
name: "tabOne", name: "tabOne",
label: '待处理', label: '待处理',
type: 0 type: '0'
}, },
{ {
name: "tabTwo", name: "tabTwo",
label: '已接受', label: '已接受',
type: 1 type: '1'
}, },
{ {
name: "tabThree", name: "tabThree",
label: '已拒绝', label: '已拒绝',
type: 2 type: '2'
}, },
], ],
@ -285,93 +311,103 @@
type: 4 type: 4
} }
], ]
obj: {}
} }
}, },
onLoad() { onLoad() {
this.tabTitle = this.tabs[0].name this.tabTitle = this.tabs[0].name
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
// console.log(this.tabs[0]) console.log(this.tabs[0])
}, },
mounted() { mounted() {
this.commislist()
}, },
methods: { methods: {
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.commislist()
},
nav(item) { nav(item) {
// uni.navigateTo({ uni.navigateTo({
// url: '/pages/commissionedSales/delegation_details/index' url: '/pages/commissionedSales/delegation_details/index'
// })
},
//获取分类数据
commislist() {
entrustlist(this.where).then((res) => {
this.orderList.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
}) })
}, },
//选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
this.where.page = 1 this.where.page = 1
this.orderList = []
this.where.status = e.type this.where.status = e.type
this.commislist() this.commislist()
}, },
//新增委托
addDelegation() {
uni.navigateTo({
url: '/pages/commissionedSales/addDelegation/index'
})
},
//管理弹窗 //管理弹窗
close() { close() {
console.log('1111111')
this.$refs.bindmobile.close() this.$refs.bindmobile.close()
this.$refs.bindmobile1.close() this.$refs.bindmobile1.close()
this.$refs.bindmobile2.close() this.$refs.bindmobile2.close()
this.$refs.bindmobile3.close() this.$refs.bindmobile3.close()
}, },
//详情 //详情
detail(item) {
detail() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/commissionedSales/delegation_details/index' url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
}) })
}, },
// 待处理 // 待处理
soldEdit(item) { soldEdit(item) {
this.obj = item this.obj = item
console.log(item)
this.$refs.bindmobile.open() this.$refs.bindmobile.open()
}, },
//已接受 //已接受
accepted() { accepted() {
this.$refs.bindmobile1.open()
}, },
//结束委托 //结束委托
closingorder() { closingorder(item) {
this.obj = item
this.$refs.bindmobile1.open() this.$refs.bindmobile1.open()
// this.$refs.bindmobile3.open() // this.$refs.bindmobile3.open()
}, },
//下单
order(item) {
uni.navigateTo({
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
})
},
//结束委托申请
deteragrss(item) {
console.log(item)
finishchain(item.community_id, {
status: 1
}).then((res) => {
this.$util.Tips({
title: res.message,
icon: 'success'
})
this.orderList = []
this.tabTitle = "tabTwo"
this.commislist()
this.$refs.bindmobile1.colse()
}).catch((err)=>{
this.$util.Tips({
title: err,
icon: 'error'
})
})
},
// 已拒绝 // 已拒绝
declined() { declined() {
// this.$refs.bindmobile2.open() this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
}, },
//删除订单 //删除订单
deleteOrder(item) { deleteOrder(item) {
checkchain(item.entrust_mer_id).then(res => { checkchain(item.community_id, {
status: 3
}).then(res => {
this.$util.Tips({ this.$util.Tips({
title: res.message, title: res.message,
icon: 'success' icon: 'success'
@ -387,7 +423,7 @@
}, },
//审核通过 拒绝 //审核通过 拒绝
passDelete(item) { passDelete(item) {
checkchain(item.entrust_mer_id, { checkchain(item.community_id, {
status: 2 status: 2
}).then((res) => { }).then((res) => {
this.$util.Tips({ this.$util.Tips({
@ -397,11 +433,12 @@
this.orderList = [] this.orderList = []
this.tabTitle = "tabOne" this.tabTitle = "tabOne"
this.commislist() this.commislist()
this.$refs.bindmobile1.colse()
}) })
}, },
//审核通过 同意 //审核通过 同意
passagree(item) { passagree(item) {
checkchain(item.entrust_mer_id, { checkchain(item.community_id, {
status: 1 status: 1
}).then((res) => { }).then((res) => {
this.$util.Tips({ this.$util.Tips({
@ -419,59 +456,11 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content {
height: 100vh;
position: relative;
}
.content_top { .content_top {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.adddelegation {
width: 694rpx;
height: 95rpx;
background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
border-radius: 47rpx 47rpx 47rpx 47rpx;
opacity: 1;
display: flex;
position: fixed;
position: absolute;
bottom: 84rpx;
left: 50%;
margin-left: -347rpx;
.adddelegation-one {
width: 50rpx;
margin-right: 30rpx;
height: 50rpx;
margin-left: 242rpx;
margin-top: 21rpx;
image {
width: 50rpx;
height: 50rpx;
}
}
.adddelegation-two {
font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
margin-top: 25rpx;
}
}
.content_top { .content_top {
width: 100%; width: 100%;
} }
@ -664,11 +653,12 @@
} }
span { span {
width: 1px; width: 0px;
height: 30rpx; height: 30rpx;
opacity: 1; opacity: 1;
margin-top: 8rpx;
background-color: #cccccc; margin-top: 10rpx;
border: 2rpx solid #CCCCCC;
} }
@ -687,7 +677,6 @@
.entrust { .entrust {
.entrust_close { .entrust_close {
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
@ -849,7 +838,7 @@
.entrust_bg-content { .entrust_bg-content {
position: absolute; position: absolute;
top: 304rpx; top: 404rpx;
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
@ -895,7 +884,7 @@
.bg-content_textarea { .bg-content_textarea {
width: 624rpx; width: 624rpx;
height: 242rpx; height: 152rpx;
padding: 25rpx 18rpx; padding: 25rpx 18rpx;
background: #F5F5F5; background: #F5F5F5;
@ -923,7 +912,5 @@
} }
} }
} }
</style> </style>

20
pages/gather/gather.vue
View File

@ -74,9 +74,6 @@
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon"></view> <view class="custom_style_icon"></view>
<view class="custom_style-txt" style="color: #282828;">
发布
</view>
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
@ -223,7 +220,6 @@
this.backColor = 'rgba(252, 252, 252, 1)' this.backColor = 'rgba(252, 252, 252, 1)'
this.isFshow = true this.isFshow = true
} }
}, },
@ -309,7 +305,7 @@
}, },
// 编辑完成 // 编辑完成
editComfirm() { editComfirm() {
this.editFlag = false; this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList)); uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
}, },
getUniMp(appid) { getUniMp(appid) {
@ -360,8 +356,10 @@
}, },
confirm(e) { confirm(e) {
this.street = e.value[1].name this.street = e.value[1].name
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
}) })
this.showPicker = false this.showPicker = false
}, },
@ -371,7 +369,7 @@
timeout: '10', timeout: '10',
success: (res) => { success: (res) => {
// console.log(res) // console.log(res)
this.isshow = false
let latitude, longitude; let latitude, longitude;
latitude = res.latitude.toString(); latitude = res.latitude.toString();
longitude = res.longitude.toString(); longitude = res.longitude.toString();
@ -385,9 +383,11 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + this.$bus.$emit('value-updated', this.street + ',' +
street_id); street_id);
}) })
}).catch(err => { }).catch(err => {
this.isshow = false
uni.showToast({ uni.showToast({
title: err, title: err,
icon: 'none' icon: 'none'
@ -395,12 +395,8 @@
}) })
}, },
fail: (err) => { fail: (err) => {
this.isshow = false
uni.showToast({
title: "获取定位超时",
icon: 'none',
duration: 2000
});
} }
}); });
}, },

72
pages/guide/guide.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<view> <view>
<view class="swiper-css zqui-rel" :style="{ height: hpx }"> <view class="swiper-css zqui-rel" :style="{ height: hpx }">
<swiper class="swiper" :style="{ height: hpx }" :indicator-dots="indicatorDots" :autoplay="autoplay" disable-touch='true' :interval="interval" <swiper class="swiper" :style="{ height: hpx }" :indicator-dots="indicatorDots" :autoplay="autoplay"
:duration="duration" @change="guideAction" > disable-touch='true' :interval="interval" :duration="duration" @change="guideAction">
<swiper-item class="flex1" v-for="(item, index) in imageList" :key="index" catchtouchmove="stopChange"> <swiper-item v-for="(item, index) in imageList" :key="index" catchtouchmove="stopChange">
<image class="image-size" mode="aspectFit" :src="item.src" /> <image class="image-size" mode="widthFix" :src="item.src" />
</swiper-item> </swiper-item>
</swiper> </swiper>
<!-- 按钮样式切换 --> <!-- 按钮样式切换 -->
<template v-if="cur != 2"> <template v-if="cur != 2">
<view class=" flex-column dots"> <view class=" flex-column dots">
@ -16,16 +16,16 @@
</block> </block>
</view> </view>
</template> </template>
<!-- 第三张图使用按钮《立即进入》 --> <!-- 第三张图使用按钮《立即进入》 -->
<template v-if="cur == 1"> <template v-if="cur == 1">
<button class="flex-column cu-btn footer" @click="launchApp">立即体验</button> <button class="flex-column cu-btn footer" @click="launchApp">立即体验</button>
</template> </template>
<!-- 右上角跳过按钮 --> <!-- 右上角跳过按钮 -->
<view class="btn-box" @click="launchApp"><text class="passbtn">跳过</text></view> <view class="btn-box" @click="launchApp"><text class="passbtn">{{num}}跳过</text></view>
</view> </view>
</view> </view>
</template> </template>
@ -35,12 +35,11 @@
data() { data() {
return { return {
//修改图片,文字描述 //修改图片,文字描述
imageList: [ imageList: [{
{
src: '/static/images/guide.png' src: '/static/images/guide.png'
} }
], ],
indicatorDots: false, indicatorDots: false,
autoplay: false, autoplay: false,
@ -49,7 +48,8 @@
iStatusBarHeight: '0px', iStatusBarHeight: '0px',
hpx: '100%', hpx: '100%',
cur: 0, cur: 0,
dotsStyles: '' dotsStyles: '',
num: 3
}; };
}, },
onLoad() { onLoad() {
@ -64,29 +64,52 @@
onReady() { onReady() {
// this.move(0, 1); // this.move(0, 1);
}, },
mounted() {
this.countDown()
},
methods: { methods: {
countDown() {
let {
num
} = this;
if (num === 3) this.nums = true;
num = num > 0 ? num - 1 : "GO";
setTimeout(() => {
this.num = num;
if (num == 'GO') {
this.launchApp()
return
}
this.countDown();
}, 1000);
},
stopTouchMove: function() { stopTouchMove: function() {
return false; return false;
}, },
launchApp() { launchApp() {
//跳过引导页,储存本地值,下次进入直接跳过 //跳过引导页,储存本地值,下次进入直接跳过
uni.setStorage({ uni.setStorage({
key: 'launchFlag', key: 'launchFlag',
data: true, data: true,
success() { success() {
uni.switchTab({ uni.switchTab({
url:'/pages/index/index' url: '/pages/index/index'
}) })
} }
}); });
}, },
guideAction(event) { guideAction(event) {
let that = this, let that = this,
index = event.detail.current; index = event.detail.current;
that.cur = index; that.cur = index;
// if (index == 0) { // if (index == 0) {
// that.move(0, 1); // that.move(0, 1);
// that.moveTwo(150, 0.1); // that.moveTwo(150, 0.1);
@ -216,7 +239,7 @@
<style lang="scss"> <style lang="scss">
page { page {
min-height: 100%; min-height: 100%;
height: 100%; height: 100%;
} }
@ -226,11 +249,12 @@
height: 100%; height: 100%;
} }
.image-size { .image-size {
width: 100%; width: 750rpx;
height: 100%; height: 100%;
border: 1px solid red;
} }
.title-box { .title-box {
@ -320,4 +344,4 @@
.swiper-item { .swiper-item {
width: 750rpx; width: 750rpx;
} }
</style> </style>

124
pages/index/index.vue
View File

@ -42,7 +42,7 @@
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm" <u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker> @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<!-- <view class="bg_color"></view> --> <!-- <view class="bg_color"></view> -->
<!--<m-tabbar native> <!--<m-tabbar native>
@ -156,58 +156,62 @@
userid: '' userid: ''
} }
}, },
onShow() {
uni.startLocationUpdate({
success: res => {
console.log('开启接收位置消息成功')
},
fail: err => {
this.selfLocation()
},
complete: msg => console.log('调用开启接收位置消息 API 完成')
});
//监听网络状态变化
uni.onNetworkStatusChange((res) => {
//当前是否有网络连接 返回true或者false
if (res.isConnected) {
this.getCateList()
this.getGoods()
this.Area()
uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = ''
if (connectstatus == true) {
connectstr = '已连接'
this.getRegistrationID()
} else {
connectstr = '未连接'
}
this.connectstatus = connectStr
})
}
});
},
onPullDownRefresh() { onPullDownRefresh() {
this.getCateList() this.getCateList()
this.productList = [] this.getGoods(true)
this.getGoods()
this.Area() this.Area()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onLoad() { onLoad() {
this.selfLocation()
this.getCateList() this.getCateList()
// this.getArticle() //this.getArticle()
this.getGoods() this.getGoods(true)
this.Area() this.Area()
//this.setPermissions() //this.setPermissions()
// this.openTongZhi() // this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = ''
if (connectstatus == true) {
connectstr = '已连接'
this.getRegistrationID()
} else {
connectstr = '未连接'
}
this.connectstatus = connectStr
})
},
onTabItemTap(e) {
console.log(e)
if (e.text.length >= 4) {
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
}
},
mounted() {
this.selfLocation()
// #ifdef H5
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
}, },
onTabItemTap(e) { onTabItemTap(e) {
uni.pageScrollTo({ uni.pageScrollTo({
@ -215,24 +219,21 @@
scrollTop: 0 scrollTop: 0
}) })
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
}, },
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
this.getGoods(false); setTimeout(() => {
this.getGoods(false);
}, 500)
} else { } else {
this.getGoods() this.getGoods()
} }
}, },
mounted() { mounted() {
this.getUserInfo() this.getUserInfo()
this.selfLocation() this.selfLocation()
@ -272,7 +273,7 @@
this.backColor = 'rgba(252, 252, 252, 1.0)' this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true this.isFshow = true
this.show = false this.show = false
this.$nextTick(()=>{ this.$nextTick(() => {
uni.setTabBarItem({ uni.setTabBarItem({
index: 0, index: 0,
text: '返回顶部', text: '返回顶部',
@ -385,9 +386,6 @@
tabsChange1(item) { tabsChange1(item) {
this.getArticleList(item.article_category_id) this.getArticleList(item.article_category_id)
this.streeta_id = item.id this.streeta_id = item.id
@ -519,11 +517,12 @@
}) })
}, },
getGoods: function(isPage) { getGoods: function(isPage) {
let that = this; let that = this;
if (that.loadend) return; if (that.loadend) return;
if (that.loading) return; if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []); if (isPage === true) that.$set(that, 'productList', []);
that.loading = true; that.loading = true;
that.loadTitle = ''; that.loadTitle = '';
graphicLstApi(that.where).then(res => { graphicLstApi(that.where).then(res => {
@ -536,7 +535,7 @@
that.$set(that, 'productList', productList); that.$set(that, 'productList', productList);
// console.log(that.productList) // console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1); that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => { }).catch(err => {
that.loading = false; that.loading = false;
that.loadTitle = '加载更多'; that.loadTitle = '加载更多';
@ -556,14 +555,15 @@
this.productList = [] this.productList = []
this.where.category_id = item.category_id this.where.category_id = item.category_id
this.emptyShow = false this.emptyShow = false
this.loadend = false; this.loadend = false;
this.$set(this.where, 'page', 1) this.$set(this.where, 'page', 1)
this.getGoods(true) this.getGoods(true)
this.street_id = item.id this.street_id = item.id
this.tabsData.tabsActive = item.index this.tabsData.tabsActive = item.index
}, },
selfLocation() { selfLocation() {
if (uni.getStorageSync('loction') == true) { if (uni.getStorageSync('loction') == true) {
this.isshow = false this.isshow = false
} else { } else {
@ -572,7 +572,7 @@
} }
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
timeout: '10', timeout: '1000',
success: (res) => { success: (res) => {
this.isshow = false this.isshow = false
let latitude, longitude; let latitude, longitude;
@ -582,6 +582,7 @@
lat: latitude, lat: latitude,
long: longitude long: longitude
}).then(res => { }).then(res => {
let town = res.data.address_reference.town.title let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street this.street = res.data.address_component.street
@ -592,6 +593,7 @@
}) })
}).catch(err => { }).catch(err => {
this.isshow = false
uni.showToast({ uni.showToast({
title: err, title: err,
icon: 'none' icon: 'none'
@ -600,11 +602,7 @@
}, },
fail: (err) => { fail: (err) => {
this.isshow = false this.isshow = false
uni.showToast({
title: "获取定位超时",
icon: 'none',
duration: 2000
});
} }
}); });
}, },

481
pages/moreProject/moreProject.vue
View File

@ -1,21 +1,22 @@
<template> <template>
<view class="gather"> <view class="gather">
<block v-if="isShow"> <block v-if="isShow">
<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'"> <view class="" v-if="userInfoData.mer_info.setup_status==1">
<view class="special_work com" v-if="true"> <view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
<view class="title">市级供应链</view> <view class="special_work com" v-if="true">
<view class="content"> <view class="title">市级供应链</view>
<view class="examine" <view class="content">
@click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)"> <view class="examine"
<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image> @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
<text class="text">在售管理</text> <image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
</view> <text class="text">在售管理</text>
<view class="examine" </view>
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)"> <view class="examine"
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image> @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<text class="text">财务管理</text> <image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
</view> <text class="text">财务管理</text>
<!-- <view class="examine" </view>
<!-- <view class="examine"
@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)"> @click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
<text class="text">财务管理</text> <text class="text">财务管理</text>
@ -25,260 +26,297 @@
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
<text class="text">订单管理</text> <text class="text">订单管理</text>
</view> --> </view> -->
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
</image>
<text class="text">入库管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
<text class="text">商户设置</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image>
<text class="text">订单核销</text>
</view>
<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
<image class="icon_img"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
</image>
<text class="text">视频教学</text>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image>
<text class="text">财务公开</text>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view> -->
</view>
</view>
</view>
<view class="business com"
v-if="userInfoData.mer_info.type_code === 'TypeStore'||userInfoData.mer_info.type_code === 'TypeTownSupplyChain'">
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
<view class="examine" <view class="examine"
@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"> @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
<!-- @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`) -->
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text>
</view>
<view class="examine"
@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
</image>
<text class="text">扫码出库</text>
</view>
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
</image> </image>
<text class="text">入库管理</text> <text class="text">入库管理</text>
</view> </view>
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
<text class="text">商户设置</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)"> <view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image> </image>
<text class="text">提现管理</text> <text class="text">提现管理</text>
</view> </view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image> </image>
<text class="text">订单核销</text> <text class="text">订单核销</text>
</view> </view>
<view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image>
<text class="text">商户设置</text>
</view>
<view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image>
<text class="text">交易大厅</text>
</view>
<view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image> </image>
<text class="text">委托销售</text> <text class="text">委托销售</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)"> <view class="examine"
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill"> @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
</image> <image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
<text class="text">发布管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
<image class="icon_img" src="@/static/images/relase.png" mode="aspectFill">
</image> </image>
<text class="text">委托订单</text> <text class="text">委托订单</text>
</view> </view> -->
<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
<image class="icon_img"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
</image>
<text class="text">视频教学</text>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)"> <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image>
<text class="text">财务公开</text>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view> -->
</view>
</view>
</view>
<view class="business com"
v-if="userInfoData.mer_info.type_code === 'TypeStore'||userInfoData.mer_info.type_code === 'TypeTownSupplyChain'">
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
<view class="examine"
@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
<!-- @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`) -->
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text>
</view>
<view class="examine"
@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
</image>
<text class="text">扫码出库</text>
</view>
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
</image>
<text class="text">入库管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image>
<text class="text">订单核销</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image>
<text class="text">商户设置</text>
</view>
<!-- <view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image>
<text class="text">交易大厅</text>
</view>
<view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image>
<text class="text">委托销售</text>
</view>
<view class="examine"
@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image>
<text class="text">委托订单</text>
</view>
<view class="examine"
@click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image>
<text class="text">发布管理</text>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image> </image>
<text class="text">财务公开</text> <text class="text">财务公开</text>
</view> --> </view> -->
</view>
</view> </view>
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view> </view>
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view> </view>
</view>
<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeCloudWarehouse'"> <view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeCloudWarehouse'">
<view class="business com" v-if="true"> <view class="business com" v-if="true">
<view class="special_work com"> <view class="special_work com">
<view class="title">里海云仓</view> <view class="title">里海云仓</view>
<view class="content "> <view class="content ">
<view class="examine" <view class="examine"
@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"> @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text> <text class="text">供货采购</text>
</view> </view>
<view class="examine" @click="navigator('/pages/users/order_list/index?status=-1')"> <view class="examine" @click="navigator('/pages/users/order_list/index?status=-1')">
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text> <text class="text">进货管理</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)"> <view class="examine"
<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill"> @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
</image> <image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
<text class="text">扫码出库</text> </image>
</view> <text class="text">扫码出库</text>
<view class="examine" </view>
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)"> <view class="examine"
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill"> @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
</image> <image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
<text class="text">入库管理</text> </image>
</view> <text class="text">入库管理</text>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)"> </view>
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill"> <view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
</image> <image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
<text class="text">提现管理</text> </image>
</view> <text class="text">提现管理</text>
</view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)"> @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image> </image>
<text class="text">客服记录</text> <text class="text">客服记录</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image> </image>
<text class="text">订单核销</text> <text class="text">订单核销</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)"> @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image> </image>
<text class="text">订单管理</text> <text class="text">订单管理</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)"> <view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image> </image>
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)"> <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image> </image>
<text class="text">财务公开</text> <text class="text">财务公开</text>
</view> --> </view> -->
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="business com"
v-if="userInfoData.mer_info.type_code === 'TypeFeaturedCultural'|| userInfoData.mer_info.type_code === 'TypeFamousSpecialties'|| userInfoData.mer_info.type_code === 'TypeLocalCuisine' ">
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image>
<text class="text">订单核销</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image>
<text class="text">商户设置</text>
</view>
</view>
</view>
</view>
</view>
</view> </view>
<view class="business com" <view class="" v-else>
v-if="userInfoData.mer_info.type_code === 'TypeFeaturedCultural'|| userInfoData.mer_info.type_code === 'TypeFamousSpecialties'|| userInfoData.mer_info.type_code === 'TypeLocalCuisine' "> <view class="business com">
<view class="business com" v-if="true">
<view class="special_work com"> <view class="special_work com">
<view class="title">我的店铺</view> <view class="title">我的店铺</view>
<view class="content "> <view class="content ">
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image>
<text class="text">订单核销</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
@ -290,7 +328,6 @@
</view> </view>
</view> </view>
</block> </block>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
@ -381,8 +418,6 @@
mounted() { mounted() {
this.appLocation() this.appLocation()
}, },
methods: { methods: {

6
pages/product/addGoods/index.vue
View File

@ -162,7 +162,7 @@
<checkbox-group class="select_group flex_start" @change="deliveryWayChange"> <checkbox-group class="select_group flex_start" @change="deliveryWayChange">
<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value"> <label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
<view> <view>
<checkbox :value="val.value" :checked="setFormData.delivery_way.includes(val.value)" /> <checkbox :value="val.value" disabled :checked="setFormData.delivery_way.includes(val.value)" />
</view> </view>
<view>{{ val.name }}</view> <view>{{ val.name }}</view>
</label> </label>
@ -174,7 +174,7 @@
<view class="popup_group_item_value"> <view class="popup_group_item_value">
<view class="popup_group_item_message"> <view class="popup_group_item_message">
<switch :checked="setFormData.delivery_free == '1'" color="#E93323" <switch :checked="setFormData.delivery_free == '1'" color="#E93323"
style="transform:scale(0.8)" @change="deliveryFreeChange" /> style="transform:scale(0.8)" @change="deliveryFreeChange" disabled="true"/>
</view> </view>
</view> </view>
</view> </view>
@ -304,7 +304,7 @@
specifica: '', // 商品规格名称 specifica: '', // 商品规格名称
setSpecificaValue: '', // 价格设置提示 setSpecificaValue: '', // 价格设置提示
setSpecificaValue2: '', setSpecificaValue2: '',
delivery_way: [], // 配送方式 1 到店核销 2 快递配送 delivery_way: [1,2], // 配送方式 1 到店核销 2 快递配送
delivery_free: '1', // 是否包邮 0不包邮 1包邮 delivery_free: '1', // 是否包邮 0不包邮 1包邮
temp_id: '', // 运费模板ID temp_id: '', // 运费模板ID
tempName: '' // 运费模板名称 tempName: '' // 运费模板名称

43
pages/product/basicSet.vue
View File

@ -72,9 +72,9 @@
<view class="flex_a_c"> <view class="flex_a_c">
<text class="sub_title">配送方式：</text> <text class="sub_title">配送方式：</text>
<view class="flex"> <view class="flex">
<checkbox-group name="" @change="checkboxChange"> <checkbox-group name="" @change="checkboxChange" >
<checkbox :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text> <checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text>
<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text> <checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text>
</checkbox-group> </checkbox-group>
</view> </view>
</view> </view>
@ -108,12 +108,10 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
<view class="bus_time flex_a_c"> <view class="bus_time flex_a_c">
<view class="select" @click="beginTimeShow = true"> <view class="select" @click="beginTimeShow = true">
{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }} {{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}</view>
</view>
至 至
<view class="select" @click="overTimeShow = true"> <view class="select" @click="overTimeShow = true">
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }} {{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view>
</view>
</view> </view>
</block> </block>
</view> </view>
@ -134,13 +132,12 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话"> <input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view> </view>
<view class="item_cell flex_a_c" <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
<u-switch v-model="credit_buy" @change="change"></u-switch> <u-switch v-model="credit_buy" @change="change"></u-switch>
</view> </view>
<view class="item_cell flex_a_c" v-if="credit_buy"> <view class="item_cell flex_a_c" v-if="credit_buy">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天"> <input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
</view> </view>
@ -220,7 +217,7 @@
}, },
isZiti: false, isZiti: false,
isKuaidi: false, isKuaidi: false,
delivery_way: [], delivery_way: [1,2],
takeName: '', takeName: '',
takePhone: '', takePhone: '',
servicePhone: '', servicePhone: '',
@ -270,13 +267,16 @@
credit_buy: false, //开启信用购 credit_buy: false, //开启信用购
interest_rate: '', //利率 interest_rate: '', //利率
settle_cycle: '', //周期 settle_cycle: '', //周期
mer_name: '', mer_name:'',
type_code: '' type_code:''
} }
}, },
onLoad(e) { onLoad(e) {
this.id = e.mer_id this.id = e.mer_id
this.getMerchantInfo(e.mer_id) // this.getMerchantInfo(e.mer_id)
this.isZiti = true
this.isKuaidi = true
}, },
onShow() {}, onShow() {},
methods: { methods: {
@ -284,7 +284,7 @@
merchantInfoAPI({ merchantInfoAPI({
id id
}).then(res => { }).then(res => {
console.log(res);
this.images[0].img = res.data.mer_banner this.images[0].img = res.data.mer_banner
this.images[1].img = res.data.mer_avatar this.images[1].img = res.data.mer_avatar
this.images[2].img = res.data.mini_banner this.images[2].img = res.data.mini_banner
@ -297,16 +297,15 @@
this.takeName = res.data.mer_take_name this.takeName = res.data.mer_take_name
this.takePhone = res.data.mer_take_phone this.takePhone = res.data.mer_take_phone
this.detailSite = res.data.mer_take_address this.detailSite = res.data.mer_take_address
this.longLati = res.data.mer_take_location.length > 0 ? res.data.mer_take_location.join(',') : this.longLati = res.data.mer_take_location.join(',') ?? ''
'' res.data.mer_take_day.forEach((item, i) => {
res.data.mer_take_day.length > 0 ? res.data.mer_take_day.forEach((item, i) => {
this.dateWeek[Number(item) - 1].isCheck = true this.dateWeek[Number(item) - 1].isCheck = true
}) : '' })
this.type_code = res.data.type_code this.type_code= res.data.type_code
this.mer_take_time = res.data.mer_take_time this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword this.cruxText = res.data.mer_keyword
this.mer_name = res.data.mer_name this.mer_name= res.data.mer_name
this.servicePhone = res.data.service_phone this.servicePhone = res.data.service_phone
this.mer_address = res.data.mer_address this.mer_address = res.data.mer_address
this.merState = res.data.mer_state === 1 ? true : false this.merState = res.data.mer_state === 1 ? true : false

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

File diff suppressed because one or more lines are too long

123
store/modules/app.js
View File

@ -1,5 +1,6 @@
import { import {
getUserInfo getUserInfo,
Appversion
} from "../../api/user.js"; } from "../../api/user.js";
import { import {
LOGIN_STATUS, LOGIN_STATUS,
@ -103,68 +104,72 @@ const actions = {
}); });
}, },
async INIT_CONFIG({ state, commit }, data = false) { async INIT_CONFIG({
// let res = await getConfig(); state,
let res = { commit
data: { }, data = false) {
version: '1.2.1', const wgt_v = uni.getStorageSync('wgt_version') || '1.0.0';
version_info: { // #ifdef APP-PLUS
"id": 4, let os = uni.getSystemInfoSync();
"title": "正式IOS测试", let apptype;
"content": "IOS正式", if (os.osName == 'ios') {
"type": 1, apptype = 2
"version": "1.2.1", } else {
"dow_url": "https://worker-task.lihaink.cn/uploads/files/20230908/20230908174409996e65763.wgt", apptype = 1
"force": 0, }
"quiet": 0, console.log(apptype, '11111')
"create_time": "2023-09-04 15:28:29", Appversion({
"update_time": "2023-09-04 15:28:29", version: os.appWgtVersion,
"delete_time": null type: apptype
} }).then((res) => {
} if (data) uni.showLoading({
} title: '检查更新中'
const wgt_v = uni.getStorageSync('wgt_version')||'1.0.0'; })
// #ifdef APP-PLUS
let os = uni.getSystemInfoSync(); // 版本更新
if(data) uni.showLoading({ if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
title: '检查更新中' compareVersions(res.data.appInfo.version,
}) wgt_v) == 1) {
// 版本更新 try {
if(compareVersions(res.data.version, os.appVersion||wgt_v)==1&&compareVersions(res.data.version, wgt_v)==1){ let info = res.data.appInfo || {};
try{ let version = {
let info = res.data.version_info||{}; title: info.title || '发现新版本',
let version = { content: info.content || '修复了部分BUG',
title: info.title||'发现新版本', versionName: info.version || '1.0.1',
content: info.content||'修复了部分BUG', downUrl: info.dow_url || '',
versionName: info.version||'1.0.1', force: info.force == 1 ? true : false, // 是否强制更新
downUrl: info.dow_url||'', quiet: info.quiet == 1 ? true : false // 是否静默更新
force: info.force==1?true:false, // 是否强制更新 }
quiet: info.quiet==1?true:false // 是否静默更新 Updater.update(version);
} } catch (e) {
Updater.update(version); console.log(e);
}catch(e){ }
console.log(e); if (data) uni.hideLoading();
} }
if(data) uni.hideLoading();
} }).catch((err) => {
// #endif console.log(err)
} })
// #endif
}
}; };
function compareVersions(version1, version2) { function compareVersions(version1, version2) {
const arr1 = version1.split('.').map(Number); const arr1 = version1.split('.').map(Number);
const arr2 = version2.split('.').map(Number); const arr2 = version2.split('.').map(Number);
for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) { for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
const num1 = i < arr1.length ? arr1[i] : 0; const num1 = i < arr1.length ? arr1[i] : 0;
const num2 = i < arr2.length ? arr2[i] : 0; const num2 = i < arr2.length ? arr2[i] : 0;
if (num1 > num2) { if (num1 > num2) {
return 1; return 1;
} else if (num1 < num2) { } else if (num1 < num2) {
return -1; return -1;
} }
} }
return 0; return 0;
} }
export default { export default {