root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
wangfukang 16 hours ago
parent
805832a5b4
commit
79a4dd825b
5 changed files with 73 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      package1/group/groupBuySingle.vue
  2. 6
      package1/myCenter/addGoods.vue
  3. 15
      package1/myCenter/goodsList.vue
  4. 32
      package1/order/orderDetail.vue
  5. 17
      package1/order/returnOrder.vue

26
package1/group/groupBuySingle.vue
View File

@ -118,7 +118,7 @@
</view>
<view class="goods-content-center">
<view class="goods-deal1">
销量 <text> {{item.tailWarn}}</text>
销量 <text> {{item.tailWarn != null ? item.tailWarn : 0}}</text>
</view>
</view>
<view class="shop-tag1">
@ -601,9 +601,13 @@
onlineWorkerInterval:2500,
onlineWorkerDuration:500,
menuList: [{
categoryName: '猜你喜欢',
id: '1',
categoryName: '推荐',
id: 'tuijian',
checked: true
},{
categoryName: '必点',
id: 'bidian',
checked: false
}],
shopRecommend:[],
availableCoupons: [],
@ -797,6 +801,8 @@
} else {
that.productItem = [...that.productItem, ...res.result.records];
}
let hasTuijian = false
let bidian = false
for(let i = 0;i<that.productItem.length;i++){
if(this.productItem[i].sellBeginTime !='' && this.productItem[i].sellEndTime != ''){
let isEndTime = this.isWithinBusinessHours(this.productItem[i].sellBeginTime,this.productItem[i].sellEndTime)
@ -808,6 +814,20 @@
that.productItem[i].isChecked = false
that.moreBuyList.push(that.productItem[i])
}
if(that.productItem[i].isPush == 1){
that.productItem[i].categoryId = 'tuijian'
hasTuijian = true
}
if(that.productItem[i].isMust == 1){
that.productItem[i].categoryId = 'bidian'
bidian = true
}
}
if(hasTuijian == false){
that.menuList.splice(0,1)
}
if(bidian == false){
that.menuList.splice(1,1)
}
console.log('好的',that.productItem)
//获取当前店铺待成团列表

6
package1/myCenter/addGoods.vue
View File

@ -137,6 +137,9 @@
</view>
</view>
<view slot="footer" style="display: flex;padding-left: 40rpx;margin-top: 20rpx;">
<uni-forms-item label="设置最大选择数" name="maxSelect">
<input type="digit" class="content-input" v-model="maxSelect" placeholder="可设置最大选择数">
</uni-forms-item>
<button type="text" @tap="$refs.addTypeDialog.close()" style="margin-right: 20rpx;">取消</button>
<button type="text" @tap="guigeSubmit">提交</button>
</view>
@ -151,6 +154,7 @@
return {
dataList: {},
modalType:0,
maxSelect:1,
categoryData:[],
categoryIndex: 0,
modalclassType:'',
@ -637,7 +641,7 @@
if(this.attrValueArr.length>0){
let index1 = false
for (var m = 0; m < this.attrValueArr.length; m++) {
if(this.attrValueArr[m].title == this.categorySonData[i].title){
if(this.attrValueArr[m].title == this.categorySonData[i].title && this.attrValueArr[m].parentName == this.typeToAttrName){
index1 = true
this.categorySonData[i].checked = true
}

15
package1/myCenter/goodsList.vue
View File

@ -37,6 +37,10 @@
</view>
<view class="box-right-num"></view>
<view class="box-right-price">
<view class="price-box">
<text>{{item.attributeListPrice | sliceMsg}}</text>
<text>价格</text>
</view>
<view class="price-box">
<text>{{item.lunchBox}}</text>
<text>餐盒费</text>
@ -151,7 +155,16 @@
}
},
filters: {
sliceMsg(val) {
var name = ''
if (typeof(val) == 'string') {
let newObj = JSON.parse(val)
for (let as in newObj) {
name = newObj[as].specPrice
}
}
return name;
},
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()

32
package1/order/orderDetail.vue
View File

@ -135,7 +135,7 @@
<view class="status-btn" style="top: 0;" v-if="orderStatus(orderDetail)" @tap="returnPopupProp(orderDetail)">
取消订单
</view>
<view class="status-btn" style="top: 0;" v-if="orderDetail.status == 5 && orderDetail.mallRefundRecord.length < 1" @tap="returnProducts(orderDetail)">
<view class="status-btn" style="top: 0;" v-if="orderDetail.status == 5 && hasRefund == false" @tap="returnProducts(orderDetail)">
申请售后
</view>
<view class="status-btn" style="top: 70rpx;" @tap="refreah(orderDetail)">
@ -441,6 +441,16 @@
查看评价 >
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="hasRefund">
<view style="flex: 1;color: #777;font-weight: 700;">
申请平台介入
</view>
<view style="color: #000;font-weight: 700;" @tap="checkEvaluate">
<img @tap="makeCall('15533910775')"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 40rpx;height: 40rpx;margin: 20rpx 0 0 20rpx;" />
</view>
</view>
</view>
</view>
</view>
@ -504,20 +514,20 @@
</uni-popup>
<uni-popup ref="returnPopup" background-color="#fff">
<view class="car-content" style="height: auto;padding: 20rpx;" v-if="orderDetail.deliveryType == 1 && orderDetail.status != 10 && orderDetail.otherOrder != 1">
<view class="car-content" style="height: auto;padding: 20rpx;" v-if="orderDetail.status != 10">
<view class="car-title" style="padding: 0 20rpx;">
选择退款原因
</view>
<view class="" style="padding: 0 20rpx;">
<view style="height:80rpx;">
<radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" />
<view style="height:80rpx;" v-if="orderDetail.otherOrder != 1">
<radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" />
全额退款（商家原因）
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="payData.deliveryType ==1">
<radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" />
全额退款（配送员原因）
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="payData.deliveryType ==1 && orderDetail.otherOrder != 1">
<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
全额退款（商家+配送员原因）
</view>
@ -612,6 +622,7 @@
refundType:3,
refundTypeStatus:4,
shopTime:'',
hasRefund:false,
peisongTime:'',
shopItem:{},
orderId:'',
@ -770,7 +781,7 @@
},
checkEvaluate(){
console.log(this.orderDetail)
if(this.orderDetail.comments.length>0){
if(this.orderDetail.comments != null && this.orderDetail.comments.length>0){
this.$refs.evaluatePopup.open()
}else{
this.tui.toast("暂无评价");
@ -964,6 +975,13 @@
that.tui.request("/mall/order/detail/"+id, "GET", {}, false, true).then((res) => {
if (res.code == 200) {
that.orderDetail = res.result;
if(that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length > 0){
for(let i = 0; i < that.orderDetail.mallRefundRecord.length;i++){
if(that.orderDetail.mallRefundRecord[i].status >= 3){
that.hasRefund = true
}
}
}
if(that.orderDetail.groupInfo){
//还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开)
if(that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2){

17
package1/order/returnOrder.vue
View File

@ -223,30 +223,25 @@
选择退款原因
</view>
<view style="padding: 0 20rpx;">
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="orderDetail.deliveryType ==1 && orderDetail.otherOrder != 1">
<radio :checked="sellTime==0" name="sellTime" @click="checkSellTime(0)" />
只退商品
商品退款
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="orderDetail.deliveryType ==1 && orderDetail.otherOrder != 1">
<radio :checked="sellTime==1" name="sellTime" @click="checkSellTime(1)" />
退配送费
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="orderDetail.otherOrder != 1">
<radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" />
全额退款（商家原因）
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="orderDetail.deliveryType ==1">
<radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" />
全额退款（配送员原因）
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="orderDetail.deliveryType ==1 && orderDetail.otherOrder != 1">
<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
全额退款（商家+配送员原因）
</view>
</view>
<view class="btn" @tap="chooseReturnType()">确认</view>

Write Preview
Loading…
Cancel
Save