列表 自取

ghsApp/src/admin/home/me.vue

@@ -153,20 +153,18 @@
               } finally {
                  uni.hideLoading(); 
               }
-              
             },
             checkToApplyCash(){
                 let self = this;
                 //没有设置提现帐号则提示
                 if(self.infoData.cashAccount == ''){
-                    console.log(1111)
                     uni.showModal({
                         title: '提示',
                         content: '您还没有设置提现帐号',
                         confirmText: "去设置",
                         success: function (res) {
                             if (res.confirm) {
-                                self.applyCash()
+                                self.$util.pageTo({url: "/pagesStore/me/cashSet"})
                             }
                         }
                     });
@@ -333,8 +331,8 @@
             & .to-cash{
                margin-left:20upx;
                border:1upx solid rgba(0,0,0,.2);
-               border-radius:18upx;
-               font-size:1upx;
+               border-radius:25upx;
+               font-size:22upx;
                padding:0 15upx 0 15upx;
             }
         }

ghsApp/src/admin/home/order.vue

@@ -98,16 +98,6 @@
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</div>
-		<!-- 免发货弹窗 -->
-		<modal-module
-			:show="freeShipModal"
-			@cancel="modalCancel"
-			@click="freeShipModalClick"
-			content="确认已自取？"
-			color="#333"
-			:size="32"
-			padding="30rpx 30rpx"
-		></modal-module>
 <!--		时间段选择-->
 		<rangeDatePick
 			:show="isShow"
@@ -264,13 +254,13 @@ export default {
 					return "配送中";
 					break;
 				case "4":
-					return "待通知";
+					return "已完成";
 					break;
 				case "5":
 					return "已取消";
 					break;
 				case "6":
-					return "已完成";
+					return "已退款";
 					break;
 				default:
 					return "";
@@ -283,8 +273,18 @@ export default {
 				uni.navigateTo({url: `/pagesOrder/select?id=${item.id}`});
 				// 自取
 			} else if (s.type === "selfGet") {
-				this.freeShipModal = true;
 				this.operateData = item;
+				let self = this;
+				uni.showModal({
+					title: '提示',
+					content: '确认客户已自取',
+					confirmText: "确认",
+					success: function (res) {
+						if (res.confirm) {
+							self.freeShipModalClick()
+						}
+					}
+				});
 				//发货
 			} else if (s.type === "send") {
 				this.pageTo({
@@ -346,17 +346,12 @@ export default {
 		// },
 		// 免发货
 		freeShipModalClick(e) {
-			if (e.index === 0) {
-				this.modalCancel();
-			} else {
-				// this.$set(this.list.data[this.operateIndex], "status", 5);
-				// this.$set(this.list.data[this.operateIndex], "sendType", 1);
+
 				freeShipping({ id: this.operateData.id }).then(res => {
 					this._list();
 					this.$msg("操作成功！");
-					this.modalCancel();
 				});
-			}
+			
 		},
 		// 查看配送
 		seeSendFn(item) {