diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index de31974..ee35f00 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -85,7 +85,8 @@ watch: { location: { handler(newVal, oldVal) { - if (newVal.address_component?.street) this.street = newVal.address_component.street + console.log(newVal, oldVal) + // if (newVal.address_component?.street) this.street = newVal.address_component.street }, immediate: true } @@ -95,7 +96,7 @@ this.Area() if (this.location.address_component?.street) this.street = this.location.address_component.street // this.street = Cache.get('LOCATION_DATA',true) - console.log( Cache.get('LOCATION_DATA')) + // console.log( Cache.get('LOCATION_DATA')) }, methods: { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index cf6b8b4..2e7503a 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -39,12 +39,18 @@ 提现管理 - + + + + 订单核销 + + + + + + + - --> - - - - - - - - - - - - - - - - - - - - - - - - - {{item.mer_name}} - - - - - - - - - - - - {{item.type_name}} - 店铺评分 - - - 1万关注 - - - - {{item.service_phone}} - - - - {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}} - - - - - - - {{item.mer_address}} - - - - - + - + + - - + + {{item.mer_name}} - + {{item.type_name}} @@ -158,10 +78,8 @@ - --> - - - + + @@ -264,7 +182,7 @@ - + @@ -298,21 +216,6 @@ }, data() { return { - tabLists: [{ - name: '默认', - order: '' - }, { - name: '销量', - order: 'sales' - }, { - name: '好评', - order: 'rate' - }, - { - name: '距离', - order: 'location' - } - ], price: 0, stock: 0, nows: false, @@ -330,27 +233,27 @@ downKey: 0, downStatus: false, // 下拉菜单 - // downMenu: [{ - // title: '默认', - // key: 0, - // order: "" - // }, - // { - // title: '销量', - // key: 1, - // order: 'sales' - // }, - // { - // title: '好评', - // key: 2, - // order: 'rate' - // }, - // { - // title: '距离', - // key: 3, - // order: 'location' - // } - // ], + downMenu: [{ + title: '默认', + key: 0, + order: "" + }, + { + title: '销量', + key: 1, + order: 'sales' + }, + { + title: '好评', + key: 2, + order: 'rate' + }, + { + title: '距离', + key: 3, + order: 'location' + } + ], // 是否第一个 firstKey: 0, // 商铺列表 @@ -379,19 +282,18 @@ storeTypeArr: [], //店铺类型 merList: [], //商户分类 product_type: 0, - show: false, - image: '', //图片, - credit_buy: '', //支持先货后款 + show:false, + image: '' ,//图片, + credit_buy:'',//支持先货后款 }; }, onLoad(options) { - - + console.log(options); this.product_type = options.product_type ?? 0 if (options.street_id != undefined) { this.sotreParam.street_id = options.street_id } - this.credit_buy = options.credit_buy + this.credit_buy=options.credit_buy this.sotreParam.type_id = options.type_id this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || '' this.sotreParam.category_id = options.cate_id && options.cate_id.split(',').toString() || '' @@ -434,10 +336,6 @@ }) } }, - sectionChange(e) { - // console.log(e) - this.set_where(e.index) - }, // 获取商户分类 getClassfication: function() { let temp = [] @@ -595,7 +493,7 @@ category_id: this.sotreParam.category_id, type_id: this.sotreParam.type_id, street_id: this.sotreParam.street_id, - credit_buy: this.credit_buy + credit_buy:this.credit_buy } if (this.latitude) { rqData.location = this.latitude + ',' + this.longitude @@ -623,9 +521,8 @@ } }, searchSubmit: function(e) { - - // let that = this; - // this.$set(that.sotreParam, 'keyword', e.detail.value); + let that = this; + that.$set(that.sotreParam, 'keyword', e.detail.value); this.set_where(this.firstKey) }, // 右侧切换 @@ -670,7 +567,7 @@ this.storeList = [] this.firstKey = e this.sotreParam.page = 1 - this.sotreParam.order = this.tabLists[e].order + this.sotreParam.order = this.downMenu[e].order this.storeMerchantList(); }, backjJump() { @@ -713,41 +610,20 @@ this.storeMerchantList() } } - + } \ No newline at end of file + + diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 45d7415..b7952a2 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -305,9 +305,17 @@ 查看物流 - 确认收货 + + + 111确认收货 + + 确认收货 + - 取件码 + + 取件码 + + { + return that.$util.Tips({ + title: '操作成功', + icon: 'success' + }, function() { + that.orderList.splice(index, 1); + that.getOrderData(); + }); + }).catch(err => { + return that.$util.Tips({ + title: err + }); + }) + } + } + }) + }, + confirmOrder: function(item) { + uni.showModal({ + title: '取件码', + content: item.logistics_code, + success: function(res) { + if (res.confirm) { + // console.log('用户点击确定'); + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }) + }, queding() { - if (orderInfo.activity_type == 98) { + let that = this; orderTake(that.order_id).then(res => { this.receivingshow = false + that.getOrderInfo(); return that.$util.Tips({ title: '成功收货', icon: 'success' }, function() { - that.getOrderInfo(); + }); }).catch(err => { this.receivingshow = false @@ -936,19 +982,7 @@ title: err }); }) - } else { - uni.showModal({ - title: '取件码', - content: item.logistics_code, - success: function(res) { - if (res.confirm) { - // console.log('用户点击确定'); - } else if (res.cancel) { - // console.log('用户点击取消'); - } - } - }) - } + }, diff --git a/pages/plantGrass/plant_release/index.vue b/pages/plantGrass/plant_release/index.vue index 35dc1e9..8c96326 100644 --- a/pages/plantGrass/plant_release/index.vue +++ b/pages/plantGrass/plant_release/index.vue @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ 添加视频 - + 添加封面 @@ -37,7 +37,7 @@ 封面 - + 添加图片 diff --git a/pages/store/applicationRecord/index.vue b/pages/store/applicationRecord/index.vue index 7a7bc8f..d5f84fe 100644 --- a/pages/store/applicationRecord/index.vue +++ b/pages/store/applicationRecord/index.vue @@ -5,18 +5,14 @@ {{item.mer_name}} 提交时间：{{item.create_time}} - + 原因：{{item.fail_msg}} - - - - + + + {{statusText(item.status)}} {{statusBtn(item.status)}} @@ -87,17 +83,16 @@ }, // 跳转逻辑 jump(item) { + console.log(item) if ([0, 2].includes(item.status)) { - console.log(item) uni.navigateTo({ - url: `/pages/store/merchantDetails/fali?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}` + url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}` }) } else if (item.status === 1) { uni.navigateTo({ url: `/pages/store/merchantDetails/index?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}` }) } - }, //状态判断 statusText(number) { @@ -113,9 +108,9 @@ statusBtn(number) { // 使用对象 let statusData = { - 0: "", - 1: "查看详情", - 2: "查看详情", + 0: "编辑", + 1: "查看", + 2: "重新提交", }; return statusData[number] }, @@ -130,91 +125,76 @@ align-items: center; background-color: #F5F5F5; padding: 20rpx 30rpx; - .card-list { width: 100%; background-color: #fff; padding: 20rpx 24rpx; margin: 10rpx 20rpx; border-radius: 12rpx; - .card-top { height: 140rpx; - .title { font-size: 28rpx; font-weight: bold; color: #333333; } - .time { color: #999999; font-size: 24rpx; padding: 5rpx 0; - margin-top: 10rpx; } - .reason { color: #E93323; font-weight: bold; font-size: 24rpx; } } - .line { height: 2rpx; margin: 20rpx 0 20rpx 0; background-color: #EEEEEE; } - .card-bottom { display: flex; justify-content: space-between; align-items: center; color: #333; - .card-status { display: flex; align-items: center; - .status-icon { - width: 50.82rpx; - height: 50.82rpx; + width: 30rpx; + height: 30rpx; margin: 10rpx; } - .status-text { font-size: 28rpx; font-weight: 500; } } - .status-btn { font-size: 26rpx; color: #555; - border: 1px solid #729FFA; + border: 1px solid #999999; padding: 8rpx 32rpx; border-radius: 40rpx; } } } } - .no-shop { width: 100%; background-color: #fff; height: 100vh; - .pictrue { display: flex; flex-direction: column; align-items: center; color: $uni-nothing-text; - image { width: 414rpx; height: 380rpx; } } } - \ No newline at end of file + diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index f842abc..bf98155 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -1,25 +1,14 @@