Merge remote-tracking branch 'origin/dev' into dev

src/views/wel/agentIndex.vue

@@ -1,74 +1,75 @@
 <template>
-  <div>
-    <el-row>
-      <el-col :span="24">
-        <third-register></third-register>
-      </el-col>
-    </el-row>
-    <el-row>
+  <el-row>
+    <el-col :span="24">
       <basic-container>
-        <el-col :span="24">
-          <avue-form :option="agentInfo.accountInfo.option" v-model="agentInfo.accountInfo.agentData">
-            <template slot-scope="scope" slot="avatar">
-              <avue-avatar :size="50" shape="circle" icon="el-icon-circle-plus-outline"
-                           :src="agentInfo.accountInfo.agentData.avatar"
-                           style="border: 1px solid #eee"/>
-              <span class="mallName">{{ agentInfo.accountInfo.agentData.accountName }}</span>
-            </template>
-            <template slot-scope="scope" slot="totalBalance">
-              <span>{{ agentInfo.accountInfo.agentData.totalBalance }} 元</span>
-            </template>
-            <template slot-scope="scope" slot="availableValance">
-              <span>{{ agentInfo.accountInfo.agentData.availableValance }} 元</span>
-            </template>
-          </avue-form>
-        </el-col>
+        <avue-form :option="agentInfo.accountInfo.option" v-model="agentInfo.accountInfo.agentData">
+          <template slot-scope="scope" slot="avatar">
+            <avue-avatar :size="50" shape="circle" icon="el-icon-circle-plus-outline"
+                         :src="agentInfo.accountInfo.agentData.avatar"
+                         style="border: 1px solid #eee"/>
+            <span class="mallName">{{ agentInfo.accountInfo.agentData.accountName }}</span>
+          </template>
+          <template slot-scope="scope" slot="totalBalance">
+            <span>{{ agentInfo.accountInfo.agentData.totalBalance }} 元</span>
+          </template>
+          <template slot-scope="scope" slot="availableValance">
+            <span>{{ agentInfo.accountInfo.agentData.availableValance }} 元</span>
+          </template>
+        </avue-form>
       </basic-container>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <basic-container>
-          <el-card class="box-card">
-            <avue-data-panel :option="optionTotal"></avue-data-panel>
-          </el-card>
-          <div style="margin-top: 30px;">
-            <h3>今日新增</h3>
-            <avue-data-display :option="optionToday"></avue-data-display>
-          </div>
-          <div style="margin-top: 30px;">
-            <h3>新增趋势
-              <el-date-picker
-                size="mini"
-                :picker-options="tenantAddTrend.pickerOptions"
-                v-model="tenantAddTrend.time"
-                type="month"
-                @change="getTenantAddTrend"
-                value-format="yyyy-MM"
-                placeholder="选择月"
-                style="float: right">
-              </el-date-picker>
-            </h3>
-            <div ref="tenantAddTrend" style="height: 500px;width: 100%"></div>
-          </div>
-          <div style="margin-top: 30px;">
-            <h3>代理账单
-              <el-date-picker
-                size="mini"
-                :picker-options="tenantPlatformBills.pickerOptions"
-                v-model="tenantPlatformBills.time"
-                type="month"
-                @change="getTenantPlatformBills"
-                value-format="yyyy-MM"
-                placeholder="选择月"
-                style="float: right">
-              </el-date-picker>
-            </h3>
-            <div ref="tenantPlatformBills" style="height: 500px;width: 100%"></div>
-          </div>
-        </basic-container>
-      </el-col>
-    </el-row>
-  </div>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <avue-data-panel :option="optionTotal"></avue-data-panel>
+      </basic-container>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <div>
+          <h3>今日新增</h3>
+          <avue-data-display :option="optionToday"></avue-data-display>
+        </div>
+      </basic-container>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <div>
+          <h3>新增趋势
+            <el-date-picker
+              size="mini"
+              :picker-options="tenantAddTrend.pickerOptions"
+              v-model="tenantAddTrend.time"
+              type="month"
+              @change="getTenantAddTrend"
+              value-format="yyyy-MM"
+              placeholder="选择月"
+              style="float: right">
+            </el-date-picker>
+          </h3>
+          <div ref="tenantAddTrend" style="height: 500px;width: 100%"></div>
+        </div>
+      </basic-container>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <div>
+          <h3>代理账单
+            <el-date-picker
+              size="mini"
+              :picker-options="tenantPlatformBills.pickerOptions"
+              v-model="tenantPlatformBills.time"
+              type="month"
+              @change="getTenantPlatformBills"
+              value-format="yyyy-MM"
+              placeholder="选择月"
+              style="float: right">
+            </el-date-picker>
+          </h3>
+          <div ref="tenantPlatformBills" style="height: 500px;width: 100%"></div>
+        </div>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import moment from "moment";
@@ -190,7 +191,7 @@ export default {
               ['trend'],
               ['商户新增'],
             ],
-            path: [ "/ldt_agent/agentrecord"]
+            path: ["/ldt_agent/agentrecord"]
           },
           xAxis: {type: 'category'},
           yAxis: {gridIndex: 0, splitNumber: 2},
@@ -271,12 +272,12 @@ export default {
       this.getTenantPlatformBills();
     },
     //删除数组的某个元素
-    deleteArrayByObj(arr,attrName,...value){
-      value.forEach(ele=>{
-        for (let i = 0;i < arr.length; i++){
+    deleteArrayByObj(arr, attrName, ...value) {
+      value.forEach(ele => {
+        for (let i = 0; i < arr.length; i++) {
           const column = arr[i];
-          if (ele === column[attrName]){
-            arr.splice(i,1);
+          if (ele === column[attrName]) {
+            arr.splice(i, 1);
           }
         }
       });
@@ -285,22 +286,22 @@ export default {
     getTenantCensusCount() {
       //获取租户数量
       getAgentTenantCensusCount().then(res => {
-        this.setArrayObjAttrByObj(this.optionTotal.data,"title","商店总数","count",res.data.data.shopCount);
-        this.setArrayObjAttrByObj(this.optionTotal.data,"title","收入总额","count",res.data.data.incomeTotal);
+        this.setArrayObjAttrByObj(this.optionTotal.data, "title", "商店总数", "count", res.data.data.shopCount);
+        this.setArrayObjAttrByObj(this.optionTotal.data, "title", "收入总额", "count", res.data.data.incomeTotal);
       });
     },
     //获取租户当日数据统计
     getTenantTodayCensusCount() {
       //获取租户数量
       getAgentTenantTodayCensusCount().then(res => {
-        this.setArrayObjAttrByObj(this.optionToday.data,"title","新增商户","count",res.data.data.shopCount);
-        this.setArrayObjAttrByObj(this.optionToday.data,"title","今日收入","count",res.data.data.incomeTotal);
+        this.setArrayObjAttrByObj(this.optionToday.data, "title", "新增商户", "count", res.data.data.shopCount);
+        this.setArrayObjAttrByObj(this.optionToday.data, "title", "今日收入", "count", res.data.data.incomeTotal);
       });
     },
     //设置数组对象属性值
-    setArrayObjAttrByObj(arr,attrName,attrValue,key,value){
-      arr.forEach(ele=>{
-        if(ele[attrName]===attrValue){
+    setArrayObjAttrByObj(arr, attrName, attrValue, key, value) {
+      arr.forEach(ele => {
+        if (ele[attrName] === attrValue) {
           ele[key] = value;
           return;
         }
@@ -314,7 +315,7 @@ export default {
         time: time.format("yyyy-MM-DD HH:mm:ss")
       }).then(res => {
         //清空内容
-        for(let i=0;i<this.tenantAddTrend.option.dataset.source.length;i++){
+        for (let i = 0; i < this.tenantAddTrend.option.dataset.source.length; i++) {
           this.tenantAddTrend.option.dataset.source[i].splice(1);
         }
 
@@ -329,7 +330,7 @@ export default {
 
           //添加Y坐标
           //添加商户新增
-          this.setAddTrend(res.data.data.shopAddCount,date,"商户新增");
+          this.setAddTrend(res.data.data.shopAddCount, date, "商户新增");
 
           //加上一天
           time.add(1, 'days');
@@ -376,7 +377,7 @@ export default {
       });
     },
     //设置趋势
-    setAddTrend(arr,date,attrName){
+    setAddTrend(arr, date, attrName) {
       //添加Y坐标
       let count = 0;
       //添加用户新增
@@ -385,8 +386,8 @@ export default {
           count = ele.count;
         }
       });
-      this.tenantAddTrend.option.dataset.source.forEach(ele=>{
-        if(ele[0]===attrName){
+      this.tenantAddTrend.option.dataset.source.forEach(ele => {
+        if (ele[0] === attrName) {
           ele.push(count);
         }
       });

src/views/wel/index.vue

@@ -1,69 +1,68 @@
 <template>
-  <div>
-    <el-row>
-      <el-col :span="24">
-        <third-register></third-register>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <basic-container>
-          <el-card class="box-card">
-            <avue-data-panel :option="optionTotal"></avue-data-panel>
-          </el-card>
-          <div style="margin-top: 30px;" v-if="userInfo.role_name==='salesman'">
-            <h3>推广二维码</h3>
-            <el-col :span="24">
-              <div class="block" v-for="(qrcode,index) in qrcode" :key="index" style="float: left">
-                <el-popover placement="right" trigger="hover">
-                  <el-image :src="qrcode.imgLink"/>
-                  <div slot="reference">
-                    <el-image class="img-hover"
-                              :src="qrcode.imgLink" fit="cover" @click="downloadImg(qrcode.imgLink)"></el-image>
-                    <p style="text-align: center;margin-bottom: 40px;color: #999;">{{ qrcode.imgName }}</p>
-                  </div>
-                </el-popover>
+  <el-row>
+    <el-col :span="24">
+      <basic-container>
+        <avue-data-panel :option="optionTotal"></avue-data-panel>
+      </basic-container>
+    </el-col>
+    <el-col :span="24" v-if="userInfo.role_name==='salesman'">
+      <basic-container>
+        <h3>推广二维码</h3>
+        <el-col :span="24">
+          <div class="block" v-for="(qrcode,index) in qrcode" :key="index" style="float: left">
+            <el-popover placement="right" trigger="hover">
+              <el-image :src="qrcode.imgLink"/>
+              <div slot="reference">
+                <el-image class="img-hover"
+                          :src="qrcode.imgLink" fit="cover" @click="downloadImg(qrcode.imgLink)"></el-image>
+                <p style="text-align: center;margin-bottom: 40px;color: #999;">{{ qrcode.imgName }}</p>
               </div>
-            </el-col>
+            </el-popover>
           </div>
-          <div style="margin-top: 30px;">
-            <h3>今日新增</h3>
-            <avue-data-display :option="optionToday"></avue-data-display>
-          </div>
-          <div style="margin-top: 30px;">
-            <h3>新增趋势
-              <el-date-picker
-                size="mini"
-                :picker-options="tenantAddTrend.pickerOptions"
-                v-model="tenantAddTrend.time"
-                type="month"
-                @change="getTenantAddTrend"
-                value-format="yyyy-MM"
-                placeholder="选择月"
-                style="float: right">
-              </el-date-picker>
-            </h3>
-            <div ref="tenantAddTrend" style="height: 500px;width: 100%"></div>
-          </div>
-          <div style="margin-top: 30px;">
-            <h3>平台账单
-              <el-date-picker
-                size="mini"
-                :picker-options="tenantPlatformBills.pickerOptions"
-                v-model="tenantPlatformBills.time"
-                type="month"
-                @change="getTenantPlatformBills"
-                value-format="yyyy-MM"
-                placeholder="选择月"
-                style="float: right">
-              </el-date-picker>
-            </h3>
-            <div ref="tenantPlatformBills" style="height: 500px;width: 100%"></div>
-          </div>
-        </basic-container>
-      </el-col>
-    </el-row>
-  </div>
+        </el-col>
+      </basic-container>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <h3>今日新增</h3>
+        <avue-data-display :option="optionToday"></avue-data-display>
+      </basic-container>
+    </el-col>
+    <el-col :span="12">
+      <basic-container>
+        <h3>新增趋势
+          <el-date-picker
+            size="mini"
+            :picker-options="tenantAddTrend.pickerOptions"
+            v-model="tenantAddTrend.time"
+            type="month"
+            @change="getTenantAddTrend"
+            value-format="yyyy-MM"
+            placeholder="选择月"
+            style="float: right">
+          </el-date-picker>
+        </h3>
+        <div ref="tenantAddTrend" style="height: 500px;width: 100%"></div>
+      </basic-container>
+    </el-col>
+    <el-col :span="12">
+      <basic-container>
+        <h3>平台账单
+          <el-date-picker
+            size="mini"
+            :picker-options="tenantPlatformBills.pickerOptions"
+            v-model="tenantPlatformBills.time"
+            type="month"
+            @change="getTenantPlatformBills"
+            value-format="yyyy-MM"
+            placeholder="选择月"
+            style="float: right">
+          </el-date-picker>
+        </h3>
+        <div ref="tenantPlatformBills" style="height: 500px;width: 100%"></div>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import moment from "moment";

src/views/wel/mallIndex.vue

@@ -1,11 +1,6 @@
 <template>
-  <div>
-    <el-row>
-      <el-col :span="24">
-        <third-register></third-register>
-      </el-col>
-    </el-row>
-    <el-row v-if="showAccountInfo">
+  <el-row>
+    <el-col :span="24" v-if="showAccountInfo">
       <basic-container>
         <el-col :span="12">
           <avue-form :option="merchant.accountInfo.option" v-model="merchant.accountInfo.mallData">
@@ -40,19 +35,19 @@
           <avue-form ref="form" :option="rechargeForm.option"
                      @submit="rechargeSubmit">
           </avue-form>
-<!--          <table border="1" cellpadding="5" bordercolor="#898989" v-if="rechargeTable.status"-->
-<!--                 :style="rechargeTable.style">-->
-<!--            <tr v-for="(item,index) in rechargeTable.option" :key="`${index}`">-->
-<!--              <th v-if="item2.type==='th'" v-for="(item2,index2) in item" :key="`${index+index2}`"-->
-<!--                  :colspan="item2.colspan?item2.colspan:1" :style="item2.style">-->
-<!--                <span v-html="item2.name"></span>{{ (typeof item2.value) === "function" ? item2.value() : item2.value }}-->
-<!--              </th>-->
-<!--              <th v-if="item2.type==='td'" v-for="(item2,index2) in item" :key="`${index+index2}`"-->
-<!--                  :colspan="item2.colspan?item2.colspan:1" :style="item2.style">-->
-<!--                <span v-html="item2.name"></span>{{ (typeof item2.value) === "function" ? item2.value() : item2.value }}-->
-<!--              </th>-->
-<!--            </tr>-->
-<!--          </table>-->
+          <!--          <table border="1" cellpadding="5" bordercolor="#898989" v-if="rechargeTable.status"-->
+          <!--                 :style="rechargeTable.style">-->
+          <!--            <tr v-for="(item,index) in rechargeTable.option" :key="`${index}`">-->
+          <!--              <th v-if="item2.type==='th'" v-for="(item2,index2) in item" :key="`${index+index2}`"-->
+          <!--                  :colspan="item2.colspan?item2.colspan:1" :style="item2.style">-->
+          <!--                <span v-html="item2.name"></span>{{ (typeof item2.value) === "function" ? item2.value() : item2.value }}-->
+          <!--              </th>-->
+          <!--              <th v-if="item2.type==='td'" v-for="(item2,index2) in item" :key="`${index+index2}`"-->
+          <!--                  :colspan="item2.colspan?item2.colspan:1" :style="item2.style">-->
+          <!--                <span v-html="item2.name"></span>{{ (typeof item2.value) === "function" ? item2.value() : item2.value }}-->
+          <!--              </th>-->
+          <!--            </tr>-->
+          <!--          </table>-->
         </el-drawer>
         <el-col :span="12">
           <div role="tab" aria-expanded="true" aria-controls="el-collapse-content-8236"
@@ -82,36 +77,36 @@
           </el-table>
         </el-col>
       </basic-container>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <basic-container>
-          <el-card class="box-card">
-            <avue-data-panel :option="optionTotal"></avue-data-panel>
-          </el-card>
-          <div style="margin-top: 30px;">
-            <h3>今日新增</h3>
-            <avue-data-display :option="optionToday"></avue-data-display>
-          </div>
-          <div style="margin-top: 30px;">
-            <h3>新增趋势
-              <el-date-picker
-                size="mini"
-                :picker-options="tenantAddTrend.pickerOptions"
-                v-model="tenantAddTrend.time"
-                type="month"
-                @change="getTenantAddTrend"
-                value-format="yyyy-MM"
-                placeholder="选择月"
-                style="float: right">
-              </el-date-picker>
-            </h3>
-            <div ref="tenantAddTrend" style="height: 500px;width: 100%"></div>
-          </div>
-        </basic-container>
-      </el-col>
-    </el-row>
-  </div>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <avue-data-panel :option="optionTotal"></avue-data-panel>
+      </basic-container>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <h3>今日新增</h3>
+        <avue-data-display :option="optionToday"></avue-data-display>
+      </basic-container>
+    </el-col>
+    <el-col :span="24">
+      <basic-container>
+        <h3>新增趋势
+          <el-date-picker
+            size="mini"
+            :picker-options="tenantAddTrend.pickerOptions"
+            v-model="tenantAddTrend.time"
+            type="month"
+            @change="getTenantAddTrend"
+            value-format="yyyy-MM"
+            placeholder="选择月"
+            style="float: right">
+          </el-date-picker>
+        </h3>
+        <div ref="tenantAddTrend" style="height: 500px;width: 100%"></div>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import moment from "moment";
@@ -359,62 +354,62 @@ export default {
                   span: 24,
                   prop: 'bankCode',
                   type: 'select',
-                  dicData:[{
-                    label:"青岛银行",
-                    value:"QDYH",
-                    desc:"QDYH"
-                  },{
-                    label:"建设银行",
-                    value:"CCB",
-                    desc:"CCB"
-                  },{
-                    label:"农业银行",
-                    value:"ABC",
-                    desc:"ABC"
-                  },{
-                    label:"光大银行",
-                    value:"CEB",
-                    desc:"CEB"
-                  },{
-                    label:"中信银行",
-                    value:"ECITIC",
-                    desc:"ECITIC"
-                  },{
-                    label:"兴业银行",
-                    value:"CIB",
-                    desc:"CIB"
-                  },{
-                    label:"华夏银行",
-                    value:"HXB",
-                    desc:"HXB"
-                  },{
-                    label:"工商银行",
-                    value:"ICBC",
-                    desc:"ICBC"
-                  },{
-                    label:"中国银行",
-                    value:"BOC",
-                    desc:"BOC"
-                  },{
-                    label:"招商银行",
-                    value:"CMBCHINA",
-                    desc:"CMBCHINA"
-                  },{
-                    label:"民生银行",
-                    value:"CMBC",
-                    desc:"CMBC"
-                  },{
-                    label:"浦发银行",
-                    value:"SPDB",
-                    desc:"SPDB"
-                  },{
-                    label:"平安银行",
-                    value:"SZPA",
-                    desc:"SZPA"
-                  },{
-                    label:"交通银行",
-                    value:"BOCO",
-                    desc:"BOCO"
+                  dicData: [{
+                    label: "青岛银行",
+                    value: "QDYH",
+                    desc: "QDYH"
+                  }, {
+                    label: "建设银行",
+                    value: "CCB",
+                    desc: "CCB"
+                  }, {
+                    label: "农业银行",
+                    value: "ABC",
+                    desc: "ABC"
+                  }, {
+                    label: "光大银行",
+                    value: "CEB",
+                    desc: "CEB"
+                  }, {
+                    label: "中信银行",
+                    value: "ECITIC",
+                    desc: "ECITIC"
+                  }, {
+                    label: "兴业银行",
+                    value: "CIB",
+                    desc: "CIB"
+                  }, {
+                    label: "华夏银行",
+                    value: "HXB",
+                    desc: "HXB"
+                  }, {
+                    label: "工商银行",
+                    value: "ICBC",
+                    desc: "ICBC"
+                  }, {
+                    label: "中国银行",
+                    value: "BOC",
+                    desc: "BOC"
+                  }, {
+                    label: "招商银行",
+                    value: "CMBCHINA",
+                    desc: "CMBCHINA"
+                  }, {
+                    label: "民生银行",
+                    value: "CMBC",
+                    desc: "CMBC"
+                  }, {
+                    label: "浦发银行",
+                    value: "SPDB",
+                    desc: "SPDB"
+                  }, {
+                    label: "平安银行",
+                    value: "SZPA",
+                    desc: "SZPA"
+                  }, {
+                    label: "交通银行",
+                    value: "BOCO",
+                    desc: "BOCO"
                   }],
                   labelWidth: 90,
                   precision: 2,
@@ -756,13 +751,13 @@ export default {
         // this.rechargeTable.status = true;
 
         //跳转支付
-        window.open(res.data.data.payUrl,"支付窗口","top=200,left=200,toolbar=no,status=no,location=no,resizable=no,menubar=no,scrollbars=no,resizable=no,width=1000,height=700");
+        window.open(res.data.data.payUrl, "支付窗口", "top=200,left=200,toolbar=no,status=no,location=no,resizable=no,menubar=no,scrollbars=no,resizable=no,width=1000,height=700");
 
         this.$message({
           type: "warning",
           message: "提交成功，请在页面进行充值!"
         });
-      }).finally(()=>{
+      }).finally(() => {
         done();
       });
     },