Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

pages/order/components/orderCenter/filterQuery.vue

@@ -304,7 +304,14 @@
 		},
 		methods: {
 			handleOpen(){
-				if(this.createTimeTxt === null){
+				const wasNull = this.createTimeTxt === null;
+				// 从父组件 queryParams 同步发单日期到筛选内展示（默认当月等）
+				if (this.value.sendDateStart && this.value.sendDateEnd) {
+					this.createTimeTxt = this.value.sendDateStart + "至" + this.value.sendDateEnd;
+				} else {
+					this.createTimeTxt = "";
+				}
+				if (wasNull && this.$refs.jtimePickerPopup) {
 					this.$refs.jtimePickerPopup.handleInit();
 				}
 			},

pages/orderDetailRefactored/components/PageThree.vue

@@ -603,14 +603,33 @@ export default {
         return
       }
 
+      // 线下支付：不弹确认框，直接更新支付方式并进入下一步
+      if (this.paymentMethodRadio === 'offline') {
+        await uni.$u.api.updateClueOrderForm({
+          id: this.orderDetail.id,
+          paymentMethod: this.paymentMethod || ''
+        })
+        this.handleNext()
+        return
+      }
+
       this.payNowModalVisible = true
     },
 
     /**
      * 确认风险警示
      */
-    confirmRiskWarning() {
+    async confirmRiskWarning() {
       this.riskWarningModalVisible = false
+      // 线下支付：不弹确认框，直接更新支付方式并进入下一步
+      if (this.paymentMethodRadio === 'offline') {
+        await uni.$u.api.updateClueOrderForm({
+          id: this.orderDetail.id,
+          paymentMethod: this.paymentMethod || ''
+        })
+        this.handleNext()
+        return
+      }
       this.payNowModalVisible = true
     },
 
@@ -624,8 +643,8 @@ export default {
         id: this.orderDetail.id,
         paymentMethod: this.paymentMethod || ''
       })
-      //如果是小葫芦线上支付或者小葫芦线上支付宝就调用接口，如果不是小葫芦线上支付就不要调用接口，直接点击下一步
-      if (this.paymentMethod === '小葫芦线上支付' || this.paymentMethod === '小葫芦线上支付宝') {
+      // 根据 radio 选择判断：线上支付（online / online_alipay）需调用支付接口，线下则直接下一步
+      if (this.paymentMethodRadio === 'online' || this.paymentMethodRadio === 'online_alipay') {
         this.$emit('confirm-pay')
       } else {
         this.handleNext()

pages/pagereceivecenter/pagereceivecenter.vue

@@ -40,10 +40,10 @@ export default {
             currentFollowUp: [],//当前订单的跟进记录
             showMoreFollowUp: false,
 
-            // 查询参数
+            // 查询参数（默认当月）
             queryParams: {
-                sendDateStart: '',
-                sendDateEnd: '',
+                sendDateStart: dayjs().startOf('month').format("YYYY-MM-DD"),
+                sendDateEnd: dayjs().format("YYYY-MM-DD"),
                 type: '1',
                 item: undefined,
                 phone: undefined,