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-07 17:09:36 +08:00
parent 70697b98eb
commit 1da1b052e6
17 changed files with 217 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
components/WaterfallsFlow/WaterfallsFlows.vue
View File

@ -2,13 +2,12 @@
<view :class="'wf-page wf-page'+type"> <view :class="'wf-page wf-page'+type">
<!-- left --> <!-- left -->
<view> <view>
<view id="left" v-if="leftList.length"> <view id="left" v-if="leftList.length">
<view v-for="(item,index) in leftList" :key="index" <view v-for="(item,index) in leftList" :key="index"
class="wf-itema" @tap="itemTap(item)"> class="wf-itema" @tap="itemTap(item)">
<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/> <WaterfallsFlowItem :item="item" :isStore="isStore" :userid='userid' :type="type" @goShop="goShop"/>
</view> </view>
</view> </view>
</view> </view>
@ -17,7 +16,7 @@
<view id="right" v-if="rightList.length"> <view id="right" v-if="rightList.length">
<view v-for="(item,index) in rightList" :key="index" <view v-for="(item,index) in rightList" :key="index"
class="wf-itemb" @tap="itemTap(item)"> class="wf-itemb" @tap="itemTap(item)">
<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/> <WaterfallsFlowItem :item="item" :isStore="isStore" :userid='userid' :type="type" @goShop="goShop"/>
</view> </view>
</view> </view>
</view> </view>
@ -26,7 +25,9 @@
<script> <script>
import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItems.vue' import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItems.vue'
import {
getUserInfo
} from '@/api/user.js';
export default { export default {
components: { components: {
WaterfallsFlowItem WaterfallsFlowItem
@ -57,6 +58,7 @@ export default {
rightList: [], // 右边列表 rightList: [], // 右边列表
mark: 0, // 列表标记 mark: 0, // 列表标记
boxHeight: [], // 下标0和1分别为左列和右列高度 boxHeight: [], // 下标0和1分别为左列和右列高度
userid:'',
}; };
}, },
watch: { watch: {
@ -107,10 +109,7 @@ export default {
immediate: true, immediate: true,
deep:true deep:true
}, },
mounted(){
this.getUserInfo()
},
// 监听标记，当标记发生变化，则执行下一个item排序 // 监听标记，当标记发生变化，则执行下一个item排序
mark() { mark() {
const len = this.allList.length; const len = this.allList.length;
@ -119,9 +118,19 @@ export default {
} }
} }
}, },
mounted(){
this.getUserInfo()
},
methods: { methods: {
/**
* 获取个人用户信息
*/
getUserInfo(){
getUserInfo().then(res => {
this.userid = res.data.uid
});
},
// 瀑布流排序 // 瀑布流排序
waterFall() { waterFall() {
const i = this.mark; const i = this.mark;

26
components/WaterfallsFlowItem/WaterfallsFlowItems.vue
View File

@ -16,15 +16,16 @@
</template> </template>
<script> <script>
import {
getUserInfo
} from '@/api/user.js';
export default { export default {
props: { props: {
item: { item: {
type: Object, type: Object,
require: true require: true
} },
userid: {
type: String|Number,
require: true
},
}, },
@ -35,28 +36,17 @@
} }
}, },
mounted() {
this.getUserInfo()
},
methods: { methods: {
/**
* 获取个人用户信息
*/
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
this.user_id = res.data.uid
});
},
gogogo(item) { gogogo(item) {
if (item.video_link.length > 0) { if (item.video_link.length > 0) {
uni.navigateTo({ uni.navigateTo({
// #ifdef MP || H5 // #ifdef MP || H5
url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1` url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
// #endif // #endif
// #ifdef APP // #ifdef APP
url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1` url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
// #endif // #endif
}) })
} else { } else {

5
components/realselist/realselist.vue
View File

@ -61,12 +61,12 @@
<view class="price_num"> <view class="price_num">
<span>委托数量</span> <span>委托数量</span>
<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;" <subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber" class="step" :min="0" :max="item.attrValue[index].stock" :value="peicenumber"
:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)"> :isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
</subtractive> </subtractive>
<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step" <subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true" :min="0" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
:isMin="true" index="11" @increment="incrementTotal($event,i,item)" :isMin="true" index="11" @increment="incrementTotal($event,i,item)"
@eventChange="numberChange($event,i)"></subtractive> @eventChange="numberChange($event,i)"></subtractive>
</view> </view>
@ -288,6 +288,7 @@
that.$set(item, 'check', true); that.$set(item, 'check', true);
that.$set(item, 'number', val.number); that.$set(item, 'number', val.number);
that.$set(item, 'price', val.price); that.$set(item, 'price', val.price);
that.peicenumber=val.number
} }
}) })
}) })

33
components/shoppinglist/shoppinglist.vue
View File

@ -61,12 +61,12 @@
<view class="price_num"> <view class="price_num">
<span>出售数量</span> <span>出售数量</span>
<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;" <subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber" class="step" :min="0" :max="item.attrValue[index].stock" :value="peicenumber"
:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)"> :isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
</subtractive> </subtractive>
<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step" <subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true" :min="0" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
:isMin="true" index="11" @increment="incrementTotal($event,i,item)" :isMin="true" index="11" @increment="incrementTotal($event,i,item)"
@eventChange="numberChange($event,i)"></subtractive> @eventChange="numberChange($event,i)"></subtractive>
</view> </view>
@ -177,6 +177,7 @@
for (let i in this.checkedArr) { for (let i in this.checkedArr) {
if (this.checkedArr[i].product_id == item.product_id) { if (this.checkedArr[i].product_id == item.product_id) {
this.checkedArr.splice(i, 1) this.checkedArr.splice(i, 1)
} }
} }
@ -184,6 +185,7 @@
}, },
incrementTotal(e, i, item) { incrementTotal(e, i, item) {
// console.log(e, i, item)
this.$set(item, 'check', false); this.$set(item, 'check', false);
for (let i in this.checkedArr) { for (let i in this.checkedArr) {
if (this.checkedArr[i].product_id == item.product_id) { if (this.checkedArr[i].product_id == item.product_id) {
@ -202,7 +204,6 @@
this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
this.bought[num].product_attr_unique = storage[e.detail.value].unique this.bought[num].product_attr_unique = storage[e.detail.value].unique
this.pickerData = storage[this.index] // 这里就是选中的对象 this.pickerData = storage[this.index] // 这里就是选中的对象
if (this.bought[num].attrValue[this.index].stock == 0) { if (this.bought[num].attrValue[this.index].stock == 0) {
this.$util.Tips({ this.$util.Tips({
title: '库存不足' title: '库存不足'
@ -288,6 +289,7 @@
that.$set(item, 'check', true); that.$set(item, 'check', true);
that.$set(item, 'number', val.number); that.$set(item, 'number', val.number);
that.$set(item, 'price', val.price); that.$set(item, 'price', val.price);
that.peicenumber=val.number
} }
}) })
}) })
@ -306,6 +308,7 @@
goodsCheck(item) { goodsCheck(item) {
this.$set(item, 'check', !item.check); this.$set(item, 'check', !item.check);
if (item.check) { if (item.check) {
if (this.peicenumber == 0) { if (this.peicenumber == 0) {
item.number = 1 item.number = 1
} }
@ -313,34 +316,12 @@
item.product_attr_unique = item.attrValue[0].unique item.product_attr_unique = item.attrValue[0].unique
} }
this.checkedArr.push(item) this.checkedArr.push(item)
this.arrayUnique(this.checkedArr, 'product_id')
} else { } else {
this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1) this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
} }
}, },
//去重
arrayUnique(arr, name) {
let hash = {}
const result = arr.reduce((acc, cru, index) => {
if (!hash[cru[name]]) {
hash[cru[name]] = {
index: acc.length
}
acc.push(cru)
} else {
console.log(acc, hash[cru[name]])
acc.splice(hash[cru[name]]['index'], 1, cru)
}
return acc;
}, [])
this.checkedArr = result
},
/*确定提交*/ /*确定提交*/
submit() { submit() {

10
components/subtractive/subtractive.vue
View File

@ -94,6 +94,10 @@
} }
if (newValue < this.min) { if (newValue < this.min) {
newValue = this.min newValue = this.min
this.$util.Tips({
title: '达到最小值了',
icon: 'error'
})
} }
if (newValue < this.max && this.maxDisabled === true) { if (newValue < this.max && this.maxDisabled === true) {
this.maxDisabled = false; this.maxDisabled = false;
@ -104,6 +108,10 @@
this.maxDisabled = true; this.maxDisabled = true;
} }
if (newValue > this.max) { if (newValue > this.max) {
this.$util.Tips({
title: '达到最大值了',
icon: 'error'
})
newValue = this.max newValue = this.max
} }
if (newValue > this.min && this.minDisabled === true) { if (newValue > this.min && this.minDisabled === true) {
@ -114,7 +122,7 @@
return; return;
} }
this.inputValue = newValue / scale; this.inputValue = newValue / scale;
this.$emit('increment',this.inputValue) this.$emit('increment', this.inputValue)
}, },
_getDecimalScale() { _getDecimalScale() {
let scale = 1; let scale = 1;

12
pages.json
View File

@ -565,6 +565,12 @@
"navigationBarTitleText": "采购订单" "navigationBarTitleText": "采购订单"
} }
}, },
{
"path": "order_list/relase",
"style": {
"navigationBarTitleText": "委托订单"
}
},
{ {
"path": "order_list/order", "path": "order_list/order",
"style": { "style": {
@ -968,7 +974,13 @@
"style": { "style": {
"navigationBarTitleText": "订单列表" "navigationBarTitleText": "订单列表"
} }
},{
"path": "financial_management/index",
"style": {
"navigationBarTitleText": "财务管理"
}
}, },
{ {
"path": "orderRefund/index", "path": "orderRefund/index",
"style": { "style": {

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

@ -6,7 +6,7 @@
</view> </view>
<view class="content_top-two"> <view class="content_top-two">
<view class="top-two-one"> <view class="top-two-one">
待评价 待处理
</view> </view>
<view class="top-two-two"> <view class="top-two-two">
2020-07-07 14:14:14 2020-07-07 14:14:14
@ -186,6 +186,7 @@
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
margin-top: 10rpx; margin-top: 10rpx;
} }
.top-two-two { .top-two-two {

119
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 list" :key="i"> <view class="content-content" v-for="(item,i) in orderList" :key="i">
<view class="content-one"> <view class="content-one">
<view class="content-one-img"> <view class="content-one-img">
@ -25,73 +25,63 @@
<view class="content-two_one" v-if="item.type==1"> <view class="content-two_one" v-if="item.type==1">
<view class="content-two-edita">
<view class="content-two-edita" @click="soldEdit">
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a"> <view class="contentgn_a" @click="soldEdit(item)">
处理 处理
</view> </view>
<span></span> <span></span>
<view class="contentgn_b" @click="detaildetail(item)">
详情
</view>
</view>
</view>
<view class="content-two_oneq" v-if="item.type==2">
<view class="content-two-editb" @click="accepted">
已接受
</view>
<view class="contentgn">
<view class="contentgn_a" @click="closingorder">
结束委托
</view>
<span></span>
<view class="contentgn_b" @click="detail"> <view class="contentgn_b" @click="detail">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_oneq" v-if="item.type==2">
<view class="content-two-editb" @click="accepted">
已接受
</view>
<view class="contentgn">
<view class="contentgn_a" @click="closingorder">
结束委托
</view>
<span></span>
<view class="contentgn_b">
详情
</view>
</view>
</view>
<view class="content-two_one" v-if="item.type==3"> <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"> <view class="contentgn_a" click="deleteOrder(item)">
删除 删除
</view> </view>
<span></span> <span></span>
<view class="contentgn_b"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</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"> <view class="contentgn_a" click="deleteOrder(item)">
删除 删除
</view> </view>
<span></span> <span></span>
<view class="contentgn_b"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="adddelegation" @click="addDelegation"> <view class="adddelegation" @click="addDelegation">
<view class="adddelegation-one"> <view class="adddelegation-one">
<image src="@/static/images/delegation.png" mode=""></image> <image src="@/static/images/delegation.png" mode=""></image>
</view> </view>
@ -99,9 +89,10 @@
新增委托 新增委托
</view> </view>
</view> </view>
<view v-if="orderList.length == 0 && this.where.page > 1"> <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;">
@ -116,13 +107,10 @@
</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">
拒绝 拒绝
@ -137,7 +125,6 @@
</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">
@ -157,15 +144,11 @@
</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">
@ -178,13 +161,10 @@
</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">
拒绝 拒绝
@ -212,20 +192,15 @@
</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">
@ -243,7 +218,7 @@
<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 {} from '@/api/sale.js' import {} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
@ -252,6 +227,7 @@
data() { data() {
return { return {
activeItem: "tabOne", activeItem: "tabOne",
status: 'loadmore',
tabTitle: "", tabTitle: "",
orderList: [], orderList: [],
where: { where: {
@ -312,25 +288,45 @@
}, },
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(){ commislist() {
// console.log('111111')
}, },
//选择 //选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
if (this.tabTitle = "tabOne") {
this.where.page = 1
this.orderList = []
this.commislist()
} else if (this.tabTitle = "tabTwo") {
this.where.page = 1
this.orderList = []
this.commislist()
} else {
this.where.page = 1
this.orderList = []
this.commislist()
}
}, },
//新增委托 //新增委托
addDelegation(){ addDelegation() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/commissionedSales/addDelegation/index' url: '/pages/commissionedSales/addDelegation/index'
}) })
}, },
//管理弹窗 //管理弹窗
@ -354,17 +350,22 @@
}, },
//已接受 //已接受
accepted() { accepted() {
this.$refs.bindmobile1.open()
}, },
//结束委托 //结束委托
closingorder() { closingorder() {
this.$refs.bindmobile3.open() this.$refs.bindmobile1.open()
// this.$refs.bindmobile3.open()
}, },
// 已拒绝 // 已拒绝
declined() { declined() {
this.$refs.bindmobile2.open() // this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
}, },
//删除订单
deleteOrder(item) {
},
// 审核未通过 编辑 // 审核未通过 编辑
auditEdit() { auditEdit() {
@ -385,7 +386,7 @@
.content { .content {
height: 100vh; height: 100vh;
position: relative; position: relative;
} }
.content_top { .content_top {

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

@ -5,7 +5,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 list" :key="i" @click="nav(item)"> <view class="content-content" v-for="(item,i) in list" :key="i" @click="nav(item)">
<view class="content-one"> <view class="content-one">
@ -23,7 +23,7 @@
</view> </view>
<view class="content-two_one" v-if="item.type==1"> <view class="content-two_one" v-if="item.type==1">
<view class="content-two-edita" @click="soldEdit"> <view class="content-two-edita" @click="soldEdit(item)">
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
@ -37,8 +37,6 @@
</view> </view>
</view> </view>
<view class="content-two_oneq" v-if="item.type==2"> <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>
@ -54,8 +52,6 @@
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==3"> <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>
@ -87,9 +83,10 @@
</view> </view>
</view> </view>
<view v-if="orderList.length == 0 && this.where.page > 1"> <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;">
@ -239,6 +236,8 @@
}, },
data() { data() {
return { return {
activeItem: "tabOne",
status: 'loadmore',
activeItem: "tabOne", activeItem: "tabOne",
tabTitle: "", tabTitle: "",
orderList: [], orderList: [],
@ -300,18 +299,43 @@
}, },
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() {
console.log('111111')
},
//选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
if (this.tabTitle = "tabOne") {
this.where.page = 1
this.orderList = []
this.commislist()
} else if (this.tabTitle = "tabTwo") {
this.where.page = 1
this.orderList = []
this.commislist()
} else {
this.where.page = 1
this.orderList = []
this.commislist()
}
}, },
//管理弹窗 //管理弹窗
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()

3
pages/index/index.vue
View File

@ -13,7 +13,7 @@
<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']" style="color: #000"></view> <view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']" style="color: #000"></view>
</navigator> </navigator>
</view> </view>
<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow"> <!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
<view class="bg-img"> <view class="bg-img">
<img :src="bgColor" alt=""> <img :src="bgColor" alt="">
</view> </view>
@ -224,7 +224,6 @@
this.$bus.$on('value-updated', (newValue) => { this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值 // 更新父组件的值
this.street = newValue.split(',')[0] this.street = newValue.split(',')[0]
}); });
}, },
// #ifdef APP-PLUS // #ifdef APP-PLUS

30
pages/moreProject/moreProject.vue
View File

@ -15,6 +15,16 @@
<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>
</view> </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}`)">
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
<text class="text">财务管理</text>
</view>
<view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&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" <view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)"> @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
@ -62,7 +72,8 @@
</view> </view>
</view> </view>
<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeStore'"> <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="business com" v-if="true">
<view class="special_work com"> <view class="special_work com">
<view class="title">我的店铺</view> <view class="title">我的店铺</view>
@ -124,7 +135,7 @@
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
<!-- <view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image> </image>
@ -140,6 +151,12 @@
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image> </image>
<text class="text">发布管理</text> <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>
<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">
@ -226,12 +243,13 @@
</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="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="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}`)"> <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>
@ -272,7 +290,7 @@
</view> </view>
</view> </view>
</block> </block>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
@ -362,7 +380,7 @@
}, },
mounted() { mounted() {
this.appLocation() this.appLocation()
}, },

21
pages/order_details/index.vue
View File

@ -21,10 +21,11 @@
<view v-else> <view v-else>
<view class='header acea-row row-middle' :class='isGoodsReturn ? "on":""'> <view class='header acea-row row-middle' :class='isGoodsReturn ? "on":""'>
<view class='pictrue' v-if="isGoodsReturn==false"> <view class='pictrue' v-if="isGoodsReturn==false">
<image v-if="orderInfo.status != 9&&orderInfo.status !=12" :src="imgUrl+'/static/order_'+(orderInfo.status+2)+'.gif'"> <image v-if="orderInfo.status != 9&&orderInfo.status !=12"
:src="imgUrl+'/static/order_'+(orderInfo.status+2)+'.gif'">
</image> </image>
<image v-else :src="imgUrl+'/static/order_2.gif'"></image> <image v-else :src="imgUrl+'/static/order_2.gif'"></image>
</view> </view>
<view class='data' :class='isGoodsReturn ? "on":""'> <view class='data' :class='isGoodsReturn ? "on":""'>
@ -60,10 +61,18 @@
<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view> <view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
</view> </view>
<view class='progress acea-row row-between-wrapper'> <view class='progress acea-row row-between-wrapper'>
<view class='iconfont icon-webicon318 t-color' <view
v-if=" orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1"> v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
<view class='iconfont icon-webicon318 t-color'>
</view>
<view class='iconfont t-color'></view>
</view> </view>
<view class='iconfont t-color' else></view> <view class="" v-else>
<view class='iconfont icon-yuandianxiao t-color'>
</view>
<view class='iconfont t-color'></view>
</view>
<view class='line b-color'></view> <view class='line b-color'></view>
<view class='iconfont' <view class='iconfont'
:class='((orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'> :class='((orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'>

30
pages/product/basicSet.vue
View File

@ -108,10 +108,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>
<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] : '选择开始时间' }}</view> {{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
</view>
至 至
<view class="select" @click="overTimeShow = true"> <view class="select" @click="overTimeShow = true">
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view> {{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
</view>
</view> </view>
</block> </block>
</view> </view>
@ -132,12 +134,13 @@
<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" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" > <view class="item_cell flex_a_c"
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>
@ -267,8 +270,8 @@
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) {
@ -281,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
@ -294,15 +297,16 @@
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.join(',') ?? '' this.longLati = res.data.mer_take_location.length > 0 ? 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

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

@ -133,7 +133,7 @@
</scroll-view> </scroll-view>
</view> </view>
<view class="shuru" v-if="this.on_line == 1"> <view class="shuru" v-if="this.on_line == 1">
数量: <input type="number" v-model="data.number" placeholder="请输入"> 数量: <input type="number" v-model="data.number" placeholder="请输入">
</view> </view>
<view class="btn"> <view class="btn">
<button class="btn_l" @click="close()">取消</button> <button class="btn_l" @click="close()">取消</button>
@ -207,13 +207,13 @@
//线下 //线下
show: false, show: false,
//单选示例 //单选示例
checkboxValue1: [], checkboxValue1: '',
// 基本案列数据 // 基本案列数据
checkboxList1: [], checkboxList1: [],
data: { data: {
product_id: '', product_id: '',
unique: "", unique: "",
number: 1 number:1
}, },
on_line: '' on_line: ''
} }
@ -240,7 +240,7 @@
} }
this.on_line = action this.on_line = action
this.checkboxList1 = rowId this.checkboxList1 = rowId
console.log(this.on_line);
if (this.checkboxList1.length == 1 && action == 0) { if (this.checkboxList1.length == 1 && action == 0) {
// this.show = true // this.show = true
navigateTo(1, '/pages/users/online_warehousing/index', { navigateTo(1, '/pages/users/online_warehousing/index', {
@ -316,7 +316,7 @@
}, },
radioChange(n) { radioChange(n) {
this.data.product_id = n.product_id this.data.product_id = n.product_id
console.log(this.data); // console.log(this.data);
}, },
// 跳转添加商品界面 // 跳转添加商品界面
jumpAddGoods() { jumpAddGoods() {

1
pages/supply_chains/supply_chains.vue
View File

@ -865,6 +865,7 @@
margin-top: -10rpx; margin-top: -10rpx;
padding: 12rpx; padding: 12rpx;
.list-con-left { .list-con-left {
width: 357rpx; width: 357rpx;
height: 482rpx; height: 482rpx;

2
pages/trading_hall/transfer_goods/index.vue
View File

@ -619,7 +619,7 @@
this.productList = [] this.productList = []
this.price = 0; this.price = 0;
console.log(data)
if (data.length > 0) { if (data.length > 0) {
this.productList = data; this.productList = data;
for (let i in data) { for (let i in data) {

2
pages/users/online_warehousing/index.vue
View File

@ -164,7 +164,7 @@
if (this.loading || this.loaded) return; if (this.loading || this.loaded) return;
this.loading = true; this.loading = true;
getOrderList(this.where, this.mer_id).then(res => { getOrderList(this.where, this.mer_id).then(res => {
console.log(res); // console.log(res);
this.shopList = res.data.list this.shopList = res.data.list
console.log(this.shopList); console.log(this.shopList);
}) })