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

1

master
tianyi 1 month ago
parent
3af77fd77f
commit
8ad2c422c3
13 changed files with 56 additions and 57 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. 24
      package1/address/addressList.vue
  2. 6
      package1/buyFood/buyFood.vue
  3. 6
      package1/group/groupBuyList.vue
  4. 12
      package1/group/groupBuySingle.vue
  5. 5
      package1/group/searchGroup.vue
  6. 4
      package1/group/shopEvaluate.vue
  7. 10
      package1/myCenter/addGoods.vue
  8. 8
      package1/myCenter/addType.vue
  9. 2
      package1/myCenter/dataStatistics.vue
  10. 24
      package1/myCenter/goodsList.vue
  11. 4
      package1/myCenter/partTimeJobRegister.vue
  12. 2
      package1/order/orderDetail.vue
  13. 6
      package1/order/returnOrder.vue

24
package1/address/addressList.vue
View File

@ -189,27 +189,27 @@
this.addressForm.areaId = match.id;
this.addressForm.areaName = match.title;
} else {
return this.tui.toast('请搜索并选择有效的楼座');
return this.tui.toast('请搜索并选择有效的楼座',1000);
}
}
if(!this.addressForm.areaId) return this.tui.toast('请搜索并选择楼座');
if(!this.addressForm.floor) return this.tui.toast('请填写所在楼层');
if(!/^-?\d+$/.test(this.addressForm.floor)) return this.tui.toast('楼层必须为整数');
if(!this.addressForm.roomNum) return this.tui.toast('请填写详细地址门牌号');
if(!this.addressForm.receiverName) return this.tui.toast('请填写收件人');
if(!this.addressForm.receiverPhone) return this.tui.toast('请填写联系电话');
if(!/^1[3-9]\d{9}$/.test(this.addressForm.receiverPhone)) return this.tui.toast('请输入有效的11位手机号码');
if(!this.addressForm.areaId) return this.tui.toast('请搜索并选择楼座',1000);
if(!this.addressForm.floor) return this.tui.toast('请填写所在楼层',1000);
if(!/^-?\d+$/.test(this.addressForm.floor)) return this.tui.toast('楼层必须为整数',1000);
if(!this.addressForm.roomNum) return this.tui.toast('请填写详细地址门牌号',1000);
if(!this.addressForm.receiverName) return this.tui.toast('请填写收件人',1000);
if(!this.addressForm.receiverPhone) return this.tui.toast('请填写联系电话',1000);
if(!/^1[3-9]\d{9}$/.test(this.addressForm.receiverPhone)) return this.tui.toast('请输入有效的11位手机号码',1000);
let url = this.addressForm.id ? "/app/userAddress/edit" : "/app/userAddress/save";
let that = this;
this.addressForm.userId = uni.getStorageSync('id')
that.tui.request(url, "POST", this.addressForm, false, true).then((res) => {
if (res.code == 200) {
that.tui.toast("保存成功");
that.tui.toast("保存成功",1000);
that.$refs.addBookPopup.close();
that.getAddressList();
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
}
}).catch(() => {});
},
@ -222,10 +222,10 @@
if (res.confirm) {
that.tui.request("/app/userAddress/delById", "POST", {id: id}, false, true).then((res) => {
if (res.code == 200) {
that.tui.toast("删除成功");
that.tui.toast("删除成功",1000);
that.getAddressList();
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
}
}).catch(() => {});
}

6
package1/buyFood/buyFood.vue
View File

@ -752,7 +752,7 @@
wxPayment() {
let that = this;
if (!this.currentOrderId || !this.backendTotalAmount) {
that.tui.toast(this.currentOrderId + this.backendTotalAmount);
that.tui.toast(this.currentOrderId + this.backendTotalAmount,1000);
return;
}
@ -807,10 +807,10 @@
that.handlePaymentSuccess();
}, 1500);
}).catch(e => {
that.tui.toast("请求失败");
that.tui.toast("请求失败",1000);
});
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
}
}
})

6
package1/group/groupBuyList.vue
View File

@ -340,7 +340,7 @@
}
}
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
}).catch((res) => {})
@ -358,7 +358,7 @@
}
}
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
}).catch((res) => {})
@ -410,7 +410,7 @@
that.isArea = false
that.$forceUpdate()
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
uni.hideLoading()

12
package1/group/groupBuySingle.vue
View File

@ -657,7 +657,7 @@
if (res.code == 200) {
this.tuanzhangOrder = res.result;
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
uni.hideLoading()
@ -817,7 +817,7 @@
that.pageNum = that.searchForm.pageNum;
that.$forceUpdate();
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
return;
}
uni.hideLoading();
@ -837,7 +837,7 @@
}
that.$forceUpdate()
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
uni.hideLoading()
@ -991,7 +991,7 @@
that.$forceUpdate();
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
return;
}
uni.hideLoading();
@ -1470,7 +1470,7 @@
});
},
fail: function(err) {
that.tui.toast("支付失败或取消");
that.tui.toast("支付失败或取消",1000);
}
});
} else {
@ -1484,7 +1484,7 @@
setTimeout(() => { that.$refs.joinSuccessPopup.open('bottom'); }, 1500);
});
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
}
}
})

5
package1/group/searchGroup.vue
View File

@ -68,7 +68,6 @@
<view style="padding-top: 4rpx;">
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" />
</view>
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" />
</view>
<view class="shop-tag">
<text style="padding: 4rpx 10rpx;background: rgba(223, 255, 176, 1);color: #777;border-radius: 6rpx;">
@ -261,7 +260,7 @@
console.log(that.shopArea)
}
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
}).catch((res) => {})
@ -295,7 +294,7 @@
that.isArea = false
that.$forceUpdate()
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
uni.hideLoading()

4
package1/group/shopEvaluate.vue
View File

@ -222,7 +222,7 @@
that.menuList[0].num = res.result.total
}
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
uni.hideLoading()
@ -252,7 +252,7 @@
this.back()
}, 1000)
} else {
that.tui.toast(res.message);
that.tui.toast(res.message,1000);
}
uni.hideLoading();
}).catch((res) => {});

10
package1/myCenter/addGoods.vue
View File

@ -211,7 +211,7 @@
},
fail() {
this.tui.toast("您未授权，图片上传功能可能会出现错误")
this.tui.toast("您未授权，图片上传功能可能会出现错误",1000)
}
})
this.typeItem = JSON.parse(JSON.stringify(this.typeItem)) || ''
@ -250,7 +250,7 @@
this.formData.categoryId = res.result.categoryId
this.edit(this.formData)
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
}
@ -366,7 +366,7 @@
}
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
},
@ -388,7 +388,7 @@
this.tui.request("/app/product/save", "post", this.formData, false, false).then((res) => {
if(res.code == 200){
that.tui.toast("操作成功");
that.tui.toast("操作成功",1000);
uni.navigateBack()
}
}).catch(() => {});
@ -400,7 +400,7 @@
this.formData.productPictures = []
this.tui.request("/app/product/edit", "post", this.formData, false, false).then((res) => {
if(res.code == 200){
that.tui.toast("操作成功");
that.tui.toast("操作成功",1000);
uni.navigateBack()
}
}).catch(() => {});

8
package1/myCenter/addType.vue
View File

@ -107,7 +107,7 @@
if (res.code == 200) {
this.indexList = res.result;
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch(() => {});
},
@ -151,7 +151,7 @@
}
}
if(that.typeText == ''){
that.tui.toast("请输入分类名")
that.tui.toast("请输入分类名",1000)
return
}
this.tui.request("/app/productCategory/save", "POST",{
@ -161,13 +161,13 @@
shopId:uni.getStorageSync('shopId')
}, false, true).then((res) => {
if (res.code == 200) {
that.tui.toast("添加成功")
that.tui.toast("添加成功",1000)
that.$refs.addTypeDialog.close()
that.sortText = ''
that.getGategoryList()
} else {
that.tui.toast("添加失败")
that.tui.toast("添加失败",1000)
}
}).catch(() => {});

2
package1/myCenter/dataStatistics.vue
View File

@ -146,7 +146,7 @@
if (res.code == 200) {
this.shopInfo = res.result
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
})

24
package1/myCenter/goodsList.vue
View File

@ -213,9 +213,9 @@
}else{
this.shopList1[index].isPush = value
}
this.tui.toast('设置成功')
this.tui.toast('设置成功',1000)
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
},
@ -231,9 +231,9 @@
}, false, true).then((res) => {
if (res.code == 200) {
that.getShareList()
that.tui.toast('删除成功')
that.tui.toast('删除成功',1000)
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
}
}).catch((res) => {})
}
@ -251,9 +251,9 @@
}else{
this.shopList1[index].isMust = value
}
this.tui.toast('设置成功')
this.tui.toast('设置成功',1000)
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
},
@ -268,9 +268,9 @@
}else{
this.shopList1[index].delFlag = value
}
this.tui.toast('设置成功')
this.tui.toast('设置成功',1000)
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
}else{
@ -283,9 +283,9 @@
}else{
this.shopList1[index].delFlag = value
}
this.tui.toast('设置成功')
this.tui.toast('设置成功',1000)
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
}
@ -351,7 +351,7 @@
this.pages = res.result.pages
}
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
},
@ -388,7 +388,7 @@
this.categoryId = this.indexList[0].id
this.getShareList();
} else {
this.tui.toast(res.message)
this.tui.toast(res.message,1000)
}
}).catch((res) => {})
},

4
package1/myCenter/partTimeJobRegister.vue
View File

@ -267,7 +267,7 @@
that.$forceUpdate();
}
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
}).catch((res) => {})
@ -282,7 +282,7 @@
}
}
} else {
that.tui.toast(res.message)
that.tui.toast(res.message,1000)
return
}
}).catch((res) => {})

2
package1/order/orderDetail.vue
View File

@ -954,7 +954,7 @@
this.$forceUpdate();
},
returnProducts(item){
uni.navigateTo({
uni.redirectTo({
url: '/package1/order/returnOrder?order=' + encodeURIComponent(JSON.stringify(item))
});
},

6
package1/order/returnOrder.vue
View File

@ -228,7 +228,7 @@
只退商品
</view>
<view style="height:80rpx;">
<view style="height:80rpx;" v-if="orderDetail.deliveryType == 1">
<radio :checked="sellTime==1" name="sellTime" @click="checkSellTime(1)" />
退配送费
@ -238,12 +238,12 @@
全额退款（商家原因）
</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">
<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
全额退款（商家+配送员原因）

Write Preview
Loading…
Cancel
Save