Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

src/views/adv/promotionAccount/index.vue

@@ -296,12 +296,12 @@ export default {
       },
       // 回调地址映射
       callbackUrlUrls: {
-        10001: 'https://ad.scrm.ylrzcloud.com/callBack/baidu/getAuthCode',
-        10002: 'https://ad.scrm.ylrzcloud.com/callBack/oceanEngine/getAuthCode',
-        10003: 'https://ad.scrm.ylrzcloud.com/callBack/tencent/getAuthCode',
-        10004: 'https://ad.scrm.ylrzcloud.com/callBack/oppo/getAuthCode',
-        10005: 'https://ad.scrm.ylrzcloud.com/callBack/vivo/getAuthCode',
-        10006: 'https://ad.scrm.ylrzcloud.com/callBack/iqiyi/getAuthCode'
+        10001: 'https://advscrm.yytcdta.com/callBack/baidu/getAuthCode',
+        10002: 'https://advscrm.yytcdta.com/callBack/oceanEngine/getAuthCode',
+        10003: 'https://advscrm.yytcdta.com/callBack/tencent/getAuthCode',
+        10004: 'https://advscrm.yytcdta.com/callBack/oppo/getAuthCode',
+        10005: 'https://advscrm.yytcdta.com/callBack/vivo/getAuthCode',
+        10006: 'https://advscrm.yytcdta.com/callBack/iqiyi/getAuthCode'
       },
       // 表单校验
       rules: {

src/views/company/companyProfit/index.vue

@@ -5,10 +5,10 @@
           <span style="font-weight:bold;" >{{company.companyName}}</span>
       </el-form-item>
       <el-form-item label="推广佣金" v-if="company!=null" >
-          <span style="font-size:20px;color:red;">{{company.tuiMoney.toFixed(2)}}</span>元
+          <span style="font-size:20px;color:red;">-- </span>元<!--{{company.tuiMoney.toFixed(2)}}-->
       </el-form-item>
-      <el-form-item label="可提现金额" v-if="company!=null" >
-          <span style="font-size:20px;color:red;">{{company.money.toFixed(2)}}</span>元
+      <el-form-item label="可提现金额" v-if="company!=null">
+          <span style="font-size:20px;color:red;">-- </span>元<!--{{company.money.toFixed(2)}}-->
       </el-form-item>
       <el-form-item label="提现状态" prop="profitStatus">
          <el-select v-model="queryParams.profitStatus" placeholder="请选择状态" clearable size="small">
@@ -36,7 +36,7 @@
           v-hasPermi="['company:companyProfit:profit']"
         >提现</el-button>
       </el-col>
-     
+
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -54,7 +54,7 @@
       <el-table-column label="ID" align="center" prop="profitId" />
       <el-table-column label="公司" align="center" prop="companyName" />
       <el-table-column label="提现金额" align="center" prop="money" />
-      <el-table-column label="余额" align="center" prop="balances" />
+<!--      <el-table-column label="余额" align="center" prop="balances" />-->
       <el-table-column label="银行名称" align="center" prop="bankName" />
       <el-table-column label="银行支行名称" align="center" prop="bankBranchName" />
       <el-table-column label="银行卡号" align="center" prop="bankCardNo" />
@@ -91,7 +91,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,7 +118,7 @@
         <el-form-item label="银行开户名" prop="bankUserName">
           <el-input v-model="form.bankUserName" placeholder="请输入银行开户名" />
         </el-form-item>
-      
+
        </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -188,8 +188,8 @@ export default {
         bankUserName: [
           { required: true, message: "银行开户名不能为空", trigger: "blur" }
         ],
-       
-        
+
+
       }
     };
   },
@@ -199,7 +199,7 @@ export default {
     });
     this.getCompanyInfo();
     this.getList();
-    
+
   },
   methods: {
     getCompanyInfo(){

src/views/company/companyRecharge/doRecharge.vue

@@ -3,9 +3,9 @@
      <el-tabs v-model="activeName"  >
       <el-tab-pane label="在线充值" name="first">
            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="当前余额"  >
+<!--          <el-form-item label="当前余额"  >
              <span style="font-size:20px;color:red;">{{money}}</span>元
-          </el-form-item>
+          </el-form-item>-->
            <el-form-item v-if="showRedPacket" label="红包余额"  >
              <span style="font-size:20px;color:red;">{{redMoney}}</span>元
            </el-form-item>

src/views/hisStore/storeOrder/allList.vue

@@ -679,9 +679,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.createTimeRange = null;
-      this.payTimeRange = null;
-      this.deliveryImportTimeRange = null;
+      this.createTimeRange = [];
+      this.payTimeRange = [];
+      this.deliveryImportTimeRange = [];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/hisStore/storeOrder/list.vue

@@ -843,9 +843,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.createTimeRange = null;
-      this.payTimeRange = null;
-      this.deliveryImportTimeRange = null;
+      this.createTimeRange = [];
+      this.payTimeRange = [];
+      this.deliveryImportTimeRange = [];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/hisStore/storeOrder/myList.vue

@@ -293,7 +293,6 @@ export default {
       addressloading: false,
       userloading: false,
       users:[],
-      userStatusOptions:[],
       show:{
         open:false,
         title:"订单详情"
@@ -573,9 +572,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.createTimeRange = null;
-      this.payTimeRange = null;
-      this.deliveryImportTimeRange = null;
+      this.createTimeRange = [];
+      this.payTimeRange = [];
+      this.deliveryImportTimeRange = [];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/live/order/index.vue

@@ -4,6 +4,7 @@
 
       <el-form-item label="订单类型" prop="orderTypeFilter">
         <el-select v-model="queryParams.orderTypeFilter" placeholder="请选择订单类型" clearable size="small">
+          <el-option label="全部" :value="null" />
           <el-option label="销售订单" :value="1" />
           <el-option label="直播订单" :value="3" />
         </el-select>
@@ -805,10 +806,10 @@ export default {
     // })
 
     // 初始化小程序列表
-    this.getAppMallOptions()
+   // this.getAppMallOptions()
 
     // 初始化ERP账户列表
-    this.getErpAccountList()
+    //this.getErpAccountList()
 
     // 加载订单列表
     this.getList()