Merge remote-tracking branch 'origin/master'

src/views/course/coursePlaySourceConfig/index.vue

@@ -589,13 +589,13 @@ export default {
       this.bindCurrentRow = row;  // 保存当前行数据
       this.bindForm.bindShow = true;
     },
-    changeSysPayModes(value){
-      console.log(value)
+    changeSysPayModes(value,row){
       const query = {
         pageNum: 1,
         pageSize: 100,
         merchantType: value,
-        isDeleted: 0
+        isDeleted: 0,
+        appId:this.bindCurrentRow.appid
       }
       listMerchantAppConfig(query).then( response => {
           this.merchantAppConfigList = response.rows;

src/views/his/userCoupon/index.vue

@@ -186,21 +186,29 @@
           :title="show.title" :visible.sync="storeOpen">
       <storeOrderDetails  ref="storeDetails" />
     </el-drawer>
+    <el-drawer
+         :with-header="false"
+         size="75%"
+          :title="show.title" :visible.sync="storeOpenTypeThree">
+      <packageOrderDetails  ref="DetailsTypeThree" />
+    </el-drawer>
   </div>
 </template>
 <script>
 import { listUserCoupon, getUserCoupon, delUserCoupon, addUserCoupon, updateUserCoupon, exportUserCoupon } from "@/api/his/userCoupon";
 import inquiryOrderDetails from '../../components/his/inquiryOrderDetails.vue';
 import storeOrderDetails from '../../components/his/storeOrderDetails.vue';
+import packageOrderDetails from '../../components/his/packageOrderDetails.vue';
 export default {
   name: "UserCoupon",
-  components: { inquiryOrderDetails,storeOrderDetails },
+  components: { inquiryOrderDetails,storeOrderDetails,packageOrderDetails },
   data() {
     return {
       show:{
         open:false,
         },
       storeOpen:false,
+      storeOpenTypeThree:false,
       // 遮罩层
       createTime:[],
       useTime:[],
@@ -290,6 +298,15 @@ export default {
               setTimeout(() => {
                    this.$refs.storeDetails.getDetails(row.businessId);
               }, 1);
+            }else if(row.businessType==3){
+              console.log('进入 businessType=3 分支');
+              this.storeOpenTypeThree=true;
+              console.log('设置 storeOpenTypeThree = true 后:', this.storeOpenTypeThree);
+              setTimeout(() => {
+                   console.log('调用 DetailsTypeThree 组件 getDetails');
+                   
+                   this.$refs.DetailsTypeThree.getDetails(row.businessId);
+              }, 1);
             }
         },
     handleClickX(tab, event) {

src/views/live/order/index.vue

@@ -232,6 +232,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="汇付商户订单号" prop="hfshh">
+        <el-input
+          v-model="queryParams.hfshh"
+          placeholder="请输入汇付商户订单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
 <!--      <el-form-item label="成本价格" prop="cost">-->
 <!--        <el-input-->
@@ -447,6 +456,7 @@
       <el-table-column label="手机号" align="center" prop="userPhone" width="120px" />
       <el-table-column label="商品规格" align="center" prop="productSpec" width="120px" />
       <el-table-column label="商品数量" align="center" prop="totalNum" width="100px" />
+      <el-table-column label="汇付商户订单号" align="center" prop="hfshh" width="100px" />
       <el-table-column label="订单金额" align="center" prop="totalPrice" width="100px">
         <template slot-scope="scope">
           <span v-if="scope.row.totalPrice != null">{{ scope.row.totalPrice.toFixed(2) }}</span>
@@ -717,6 +727,7 @@ export default {
         pageSize: 10,
         companyId: null,
         deptId: null,
+        hfshh: null,
         orderTypeFilter: null,
         salesName: null,
         orderCodes: [],

src/views/qw/qwCompany/index.vue

@@ -200,14 +200,14 @@
         <el-form-item label="聊天工具栏实际运用地址" prop="chatToolbarOauth">
           <el-input v-model="form.chatToolbarOauth" placeholder="请输入聊天工具栏实际运用地址" />
         </el-form-item>
-        <el-form-item label="app分享小程序原始id" prop="yjfyyAppId">
-          <el-input v-model="form.yjfyyAppId" placeholder="app分享小程序原始id" />
+        <el-form-item label="app分享小程序原始id" prop="shareAppId">
+          <el-input v-model="form.shareAppId" placeholder="app分享小程序原始id" />
         </el-form-item>
-        <el-form-item label="app分享小程序应用id" prop="yjfyyAgentId">
-          <el-input v-model="form.yjfyyAgentId" placeholder="app分享小程序应用id" />
+        <el-form-item label="app分享小程序应用id" prop="shareAgentId">
+          <el-input v-model="form.shareAgentId" placeholder="app分享小程序应用id" />
         </el-form-item>
-        <el-form-item label="app分享小程序schma" prop="yjfyySchema">
-          <el-input v-model="form.yjfyySchema" placeholder="app分享小程序schema" />
+        <el-form-item label="app分享小程序schma" prop="shareSchema">
+          <el-input v-model="form.shareSchema" placeholder="app分享小程序schema" />
         </el-form-item>
         <el-form-item label="关联公司" prop="companyIds">
 
@@ -369,9 +369,9 @@ export default {
         createTime: null,
         updateTime: null,
         createBy: null,
-        yjfyyAppId: null,
-        yjfyyAgentId: null,
-        yjfyySchema: null,
+        shareAppId: null,
+        shareAgentId: null,
+        shareSchema: null,
       };
       this.resetForm("form");
     },