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

src/views/adv/conversionLog/index.vue

@@ -61,14 +61,14 @@
       <el-table-column label="系统回传事件" align="center" prop="sysConversionEvent" min-width="150" show-overflow-tooltip />
       <el-table-column label="广告商回传类型" align="center" prop="advConversionEvent" min-width="150" show-overflow-tooltip />
       <el-table-column label="站点ID" align="center" prop="siteId" width="100" />
-      <el-table-column label="着陆页" align="center" prop="landingUrl" min-width="200" show-overflow-tooltip>
+      <!-- <el-table-column label="着陆页" align="center" prop="landingUrl" min-width="200" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link v-if="scope.row.landingUrl" :href="scope.row.landingUrl" target="_blank" type="primary">
             {{ scope.row.landingUrl }}
           </el-link>
           <span v-else>-</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="回传时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>

src/views/adv/promotionAccount/index.vue

@@ -217,7 +217,7 @@
                 clearable
               />
             </el-form-item>
-            <el-form-item v-if="form.advertiserId !== 10002" label="应用授权链接" prop="authUrl" class="slide-fade">
+            <el-form-item v-if="form.advertiserId !== 10002 && form.advertiserId !== 10004" label="应用授权链接" prop="authUrl" class="slide-fade">
               <el-input 
                 v-model="form.authUrl" 
                 placeholder="请输入应用授权链接"
@@ -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/companyMoneyLogs/index.vue

@@ -264,6 +264,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.createTimeRange = null;
+      this.createTimeRange = []; // 清空日期范围选择器的值
       this.handleQuery();
     },
     // 多选框选中数据

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/live/liveConfig/liveRedConf.vue

@@ -355,6 +355,9 @@ export default {
         redId: row.redId,
         redStatus: status,
         totalLots: row.totalLots,
+        totalSend: row.totalSend,
+        redType: row.redType,
+        redNum: row.redNum,
         liveId: this.liveId,
         status: status,
         duration: row.duration

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()

src/views/live/order/liveDetail.vue

@@ -73,6 +73,10 @@
           <el-descriptions-item label=" 公众号/渠道" ><span v-if="item!=null">{{item.channel}}</span></el-descriptions-item>
           <el-descriptions-item label=" 渠道" ><span v-if="item!=null"><dict-tag :options="channelOptions" :value="item.orderChannel"/></span></el-descriptions-item>
           <el-descriptions-item label=" 企微主体" ><span v-if="item!=null"><dict-tag :options="qwSubjectOptions" :value="item.qwSubject"/></span></el-descriptions-item>
+          <el-descriptions-item label="物流公司编码" ><span v-if="item!=null">{{item.deliveryCode}}</span></el-descriptions-item>
+          <el-descriptions-item label="物流公司名称" ><span v-if="item!=null">{{item.deliveryName}}</span></el-descriptions-item>
+          <el-descriptions-item label="物流单号" ><span v-if="item!=null">{{item.deliverySn}}</span></el-descriptions-item>
+          <el-descriptions-item label="发货时间" ><span v-if="item!=null">{{item.deliverySendTime}}</span></el-descriptions-item>
         </el-descriptions>
       </el-card>
     </div>
@@ -710,17 +714,15 @@ export default {
 
     //修改订单状态
     submitEditForm(){
+      var that = this;
       this.$refs["editForm"].validate(valid => {
         if (valid) {
           updateLiveOrder(this.editForm).then(response => {
             if (response.code === 200) {
               this.msgSuccess("操作成功");
               this.edit.open = false;
-              getLiveOrder(this.item.orderId).then(response => {
-                this.item=response.data
-                that.getlogList(this.item.orderId);
-                that.$parent.$parent.getList();
-              });
+              // 刷新当前页面数据
+              this.getDetails(this.item.orderId, this.nickName, this.storeName);
             }
           });
         }
@@ -982,10 +984,8 @@ export default {
             if (response.code === 200) {
               this.msgSuccess("操作成功");
               this.editDy.open = false;
-              getLiveOrder(this.item.orderId).then(response => {
-                this.item = response.data;
-                this.$parent.$parent.getList();
-              });
+              // 刷新当前页面数据
+              this.getDetails(this.item.orderId, this.nickName, this.storeName);
             }
           })
         }

src/views/live/order/storeDetail.vue

@@ -81,9 +81,9 @@
 <!--            <el-descriptions-item label="订单类型"  >
               <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="order!=null&&order.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
             </el-descriptions-item>-->
-            <el-descriptions-item label="物流公司编号"  >
+            <el-descriptions-item label="物流公司编码"  >
                 <span v-if="order!=null">
-                  {{order.deliverySn}}
+                  {{order.deliveryCode || order.deliverySn}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="物流公司名称"  >
@@ -93,7 +93,12 @@
             </el-descriptions-item>
             <el-descriptions-item label="物流单号"  >
                 <span v-if="order!=null">
-                  {{order.deliveryId}}
+                  {{order.deliverySn || order.deliveryId}}
+                </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="发货时间"  >
+                <span v-if="order!=null">
+                  {{order.deliverySendTime}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="物流状态"  >

src/views/live/order/userDetail.vue

@@ -81,9 +81,9 @@
 <!--            <el-descriptions-item label="订单类型"  >
               <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="order!=null&&order.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
             </el-descriptions-item>-->
-            <el-descriptions-item label="物流公司编号"  >
+            <el-descriptions-item label="物流公司编码"  >
                 <span v-if="order!=null">
-                  {{order.deliverySn}}
+                  {{order.deliveryCode || order.deliverySn}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="物流公司名称"  >
@@ -93,7 +93,12 @@
             </el-descriptions-item>
             <el-descriptions-item label="物流单号"  >
                 <span v-if="order!=null">
-                  {{order.deliveryId}}
+                  {{order.deliverySn || order.deliveryId}}
+                </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="发货时间"  >
+                <span v-if="order!=null">
+                  {{order.deliverySendTime}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="物流状态"  >

src/views/qw/externalContact/index.vue

@@ -454,6 +454,7 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
+      <el-table-column label="广告业务ID" align="center" prop="traceId" />
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">
@@ -716,7 +717,7 @@
     <el-dialog title="批量移除标签" :visible.sync="tagDelOpen" width="800px" append-to-body>
       <div>搜索标签：
         <el-input v-model="queryTagParams.name" placeholder="请输入标签名称" clearable size="small" style="width: 200px;margin-right: 10px" />
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="getPageListTagGroup()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchTags(queryTagParams.name)">搜索</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="cancelSearchTags">重置</el-button>
       </div>
       <el-form ref="form" :model="addTagForm"  label-width="80px">
@@ -1722,7 +1723,6 @@ export default {
           if(this.tagGroupList[i].tag[x].isSelected==true){
             this.addTagForm.tagIds.push(this.tagGroupList[i].tag[x].tagId)
           }
-
         }
       }
       if(this.addTagForm.tagIds==[]||this.addTagForm.tagIds==null||this.addTagForm.tagIds==""){
@@ -1732,11 +1732,17 @@ export default {
       this.addTagForm.corpId=this.queryParams.corpId
       this.addTagForm.userIds=this.ids;
       this.addTagForm.filter = this.tagFilter;
-      let obj = JSON.parse(JSON.stringify(this.queryParams))
-      if(obj.tagIds !== null && obj.tagIds !== undefined && obj.tagIds !== ''){
+
+      // 修改这里：正确处理参数对象
+      let obj = JSON.parse(JSON.stringify(this.queryParams));
+
+      // 将逗号分隔的字符串转换为数组
+      if(obj.tagIds && typeof obj.tagIds === 'string') {
         obj.tagIds = obj.tagIds.split(",");
       }
-      this.addTagForm.param = obj;
+      if(obj.outTagIds && typeof obj.outTagIds === 'string') {
+        obj.outTagIds = obj.outTagIds.split(",");
+      }
 
       let loadingRock = this.$loading({
         lock: true,

src/views/qw/friendWelcome/deptFriendWelcome.vue

@@ -26,17 +26,17 @@
           <el-option v-for="dict in allowSelectOptions" :key="dict.dictValue" :label="dict.dictLabel"  :value="dict.dictValue"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker clearable size="small"
-          v-model="queryParams.createdTime"
+          v-model="queryParams.createTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择创建时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="更新时间" prop="updateTieme">
+      <el-form-item label="更新时间" prop="updateTime">
         <el-date-picker clearable size="small"
-          v-model="queryParams.updateTieme"
+          v-model="queryParams.updateTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择更新时间">
@@ -1077,8 +1077,8 @@ export default {
         companyId: null,
         //默认欢迎语附件
         attachments: [],
-        createdTime: null,
-        updateTieme: null,
+        createTime: null,
+        updateTime: null,
         isSendMsg:'1',
         welcomeText: '',
         isDayparting: '2',

src/views/qw/groupChatTransferLog/index.vue

@@ -70,7 +70,9 @@ export default {
       total: 0,
       queryParams: {
         corpId: null,
-        name: null
+        name: null,
+        pageNum: 1,
+        pageSize: 10
       },
       myQwCompanyList: [],
       transferLogList: [],

src/views/users/user/transfer.vue

@@ -52,6 +52,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+     <el-form-item label="会员状态" prop="projectId">
+        <el-select  v-model="queryParams.status" placeholder="请选择会员状态" clearable size="small" >
+          <el-option
+            v-for="item in projectUserStatus"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建时间" prop="createTimeText">
         <el-date-picker
           v-model="createTimeText"
@@ -188,17 +199,23 @@ export default {
         pageSize: 10,
         salesName: null,
         phoneNumber: null,
+        status:null,
         sTime:null,
         eTime:null,
       },
       projectOptions: [],
       selectedUser: [],
+      projectUserStatus:[]
+
     };
   },
   created() {
     this.getDicts("sys_course_project").then(response => {
       this.projectOptions = response.data;
     });
+    this.getDicts("project_user_status").then(response => {
+      this.projectUserStatus = response.data;
+    });
     getUserList().then(res=>{
       if(res.code === 200) {
         this.companyUserList = res.data