1. 优化

src/views/distribution/recordMr/index.vue

@@ -43,7 +43,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="场次时间">
+      <!-- <el-form-item label="场次时间">
         <el-date-picker style="width: 230px;" v-model="queryParams.performDate" @change="pagePerformTimeListFun"
           type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
         </el-date-picker>
@@ -52,7 +52,34 @@
         <el-select v-model="queryParams.performTimeId" placeholder="场次" clearable style="width: 100%">
           <el-option v-for="dict in pagePerformTimeList" :key="dict.id" :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'" :value="dict.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
+      <el-form-item label="场次时间" label-width="70px">
+          <el-date-picker
+            style="width: 250px;"
+            v-model="queryParams.performDate"
+            @change="pagePerformTimeListFun"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="场次" v-if="!multiPerformDate">
+          <el-select
+            v-model="queryParams.performTimeId"
+            placeholder="场次"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in pagePerformTimeList"
+              :key="dict.id"
+              :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
       <el-form-item label="支付时间">
           <el-date-picker
             style="width: 230px;"
@@ -196,10 +223,11 @@ export default {
       visibleType: '',
       handleExportLoading: false,
       pagePerformTimeList: [], // 场次列表
+      multiPerformDate:false,
     };
   },
   created() {
-    this.$set(this.queryParams,'performDate',moment().format("yyyy-MM-DD"))
+    this.$set(this.queryParams,'performDate',[moment().format("yyyy-MM-DD"),moment().format("yyyy-MM-DD")])
     this.pagePerformTimeListFun(this.queryParams.performDate)
     this.getList();
   },
@@ -215,6 +243,14 @@ export default {
         params.payBeginTime = null
         params.payEndTime = null
       }
+      if(params.performDate){
+        params.performBeginDate = params.performDate[0];
+        params.performEndDate = params.performDate[1];
+      }else {
+        params.performBeginDate   = null
+        params.performEndDate = null
+      }
+      delete params.performDate
       delete params.time
       pageList(params)
       .then(response => {
@@ -271,6 +307,14 @@ export default {
             params.payBeginTime = null
             params.payEndTime = null
           }
+          if(params.performDate){
+            params.performBeginDate = params.performDate[0];
+            params.performEndDate = params.performDate[1];
+          }else {
+            params.performBeginDate   = null
+            params.performEndDate = null
+          }
+          delete params.performDate
           delete params.time
           delete params.pageNum
           delete params.pageSize
@@ -292,11 +336,16 @@ export default {
         this.pagePerformTimeList = []
         this.$set(this.queryParams, 'performTimeId', null)
         if (!value) {
-
+          return
+        }
+        if(value.length==2&&value[0]==value[1]){
+          this.multiPerformDate = false
+        }else{
+          this.multiPerformDate = true
           return
         }
         let { data, code } = await pagePerformTimeList({
-          performDate: value,
+          performDate: value[0],
           pageNum: 1,
           pageSize: 999
         })

src/views/marketing/coupon/dialog/addAndEdit.vue

@@ -34,7 +34,7 @@
           <el-input placeholder="优惠额度" v-model="form.quota">
             <template slot="append">
               <span v-if="form.type==1">元</span>
-              <span v-if="form.type==2">折</span>
+              <span v-if="form.type==2">%</span>
             </template>
           </el-input>
         </el-form-item>
@@ -85,10 +85,10 @@
             <template slot="append">张</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="是否叠加" prop="isAdd" required>
+        <!-- <el-form-item label="是否叠加" prop="isAdd" required>
           <el-radio v-model="form.isAdd" :label="1">否</el-radio>
           <el-radio v-model="form.isAdd" :label="2">是</el-radio>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="领取限制" prop="receiveType" required>
           <el-radio v-model="form.receiveType" :label="1">否</el-radio>
           <el-radio v-model="form.receiveType" :label="2">是</el-radio>
@@ -231,10 +231,11 @@ export default {
         });
       }else{
         this.title = "新增优惠券";
-        this.$nextTick(() => {
-          this.$refs["form"].clearValidate();
-        });
+        
       }
+      this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
     },
     getGoodsIds(data, type) {
         if (type == "array") {
@@ -260,12 +261,13 @@ export default {
      */
     submitForm() {
       delete this.form.useDate;
-      this.form.useGood = this.getGoodsIds(this.form.useGood, "array")
       this.$refs["form"].validate(async (valid) => {
         if (valid) {
           try {
             this.loading = true;
-            const { code } = await saveAndEdit({ ...this.form });
+            let params = JSON.parse(JSON.stringify(this.form))
+            params.useGood = this.getGoodsIds(params.useGood, "array")
+            const { code } = await saveAndEdit({ ...params });
             if (code === 200) {
               this.$message.success("操作成功!");
               this.$emit("getList");

src/views/windowTicketSales/model/increaseViewers.vue

@@ -209,6 +209,7 @@
                     payStatus==2 ? '生成订单生成成功,请点击调取扫码盒子' : 
                     payStatus==4 ? '扫码支付失败!!!' :
                     payStatus==5 ? '请出示付款码!!!' :
+                    payStatus==5.5 ? '扫码失败，请刷新付款码，再进行扫码!!!' :
                     payStatus==6 ? '连接扫码器失败!!!' :
                     payStatus==7 ? '用户支付失败或未支付,请重新连接支付!!!' :
                     payStatus==8 ? '用户支付成功,请点击打印票!!!' :
@@ -348,6 +349,9 @@ import {
     
         balance: null, // 授信额度
         grantQuota: null, // 授信使用额度
+
+        code: null, // 支付code
+        codeTime: null // 检测是websocket是否还在连接
     };
       
     },
@@ -488,6 +492,8 @@ import {
         },
         /**  取消订单   */
         async orderInfoCancelFun(type){
+            // let payStatus = this.payStatus
+            // this.payStatus = null
             try {
                 this.loading = true
                 this.loadingText = "取消订单中..."
@@ -496,6 +502,11 @@ import {
                 }).then((res)=>{
                     if(res.code==200) {
                         if(type){ // 关闭弹窗
+                            if(this.codeTime) {
+                                clearInterval(this.codeTime)
+                            }
+                            this.orderId = null
+                            this.payStatus = null
                             this.$emit('clearDialogVisible')
                             this.dialogVisible = false
                         }else {
@@ -503,6 +514,8 @@ import {
                             this.loading = false
                         }
                         
+                    }else {
+                        
                     }
                 }).catch(()=>{
                     this.$message.error('订单关闭失败!!!');
@@ -975,6 +988,7 @@ import {
             this.loading = true
             this.loadingText = "连接扫码盒子中!!!"
             this.payStatus =  null
+            this.code = null
             this.websocketClear()
             console.log('sdfdsfsd')
             if (!this.websocket_connected) {
@@ -982,7 +996,7 @@ import {
                 this.websocketCtrl = new WebSocket(host,'ctrl');
                 this.websocketData = new WebSocket(host,'data');
                 this.websocketData.onopen = (evt) => {
-                    console.log('sdasdasd====',evt)
+                    console.log('连接结果====',evt)
                     this.loading = false
                     this.payStatus = 5
                     this.websocket_connected = true;
@@ -993,7 +1007,11 @@ import {
                     this.payStatus = 6
                     //this.vbar_open()
                 }
-
+                this.websocketData.onclose = (evt) => {
+                    console.log('关闭 ==== ',evt)
+                    // this.payStatus = 6
+                    //this.vbar_open()
+                }
                 this.websocketData.onmessage = (evt) => {
                     console.log("接受消息====",evt)
                     this.websocket_decode(evt.data);
@@ -1004,17 +1022,32 @@ import {
         },
         /**  连接结果 */
         websocket_open_state(message){
+            console.log("连接结果 ===== ",message)
+            this.codeTime = setInterval(()=>{
+                console.log("检测是否连接")
+                if(this.websocketData.readyState != WebSocket.OPEN) {
+                    this.payStatus = 6
+                }
+            },3000)
             //document.getElementById('wsocket').value = "已连接";
         },
         //接收扫码结果处理
         websocket_decode(code){
-            console.log()
-            if(this.orderId && this.payStatus==5 &&code) {
+            console.log("code=========",this.orderId , code)
+            if(this.orderId && (this.payStatus==5 ||this.payStatus == 5.5)  &&code) {
+                if(this.codeTime) {
+                    clearInterval(this.codeTime)
+                }
                 this.gotoMicroPayFun(this.orderId,code)
+            }else if(!code){
+                this.payStatus = 5.5
             }
         },
         /** 关闭通讯 */
         websocketClear(){
+            if(this.codeTime) {
+                clearInterval(this.codeTime)
+            }
             if(this.websocketCtrl){
                 this.websocketCtrl.close()
             }