Merge branch 'rprofit' of 39.97.239.116:gyfl/xyzshop into rprofit

admin/templates/default/analysis.new_version.mch_order_send.php

@@ -157,7 +157,52 @@
             type: 'datetime'
         });
 
+        let allMchid;
+        let qualitys;
+
+        function updateQualityTable() {
+            const allQualityList = JSON.parse(JSON.stringify(qualitys));
+
+            allQualityList.map(item => {
+                item.active = false;
+            })
+
+
+            function findItem(value) {
+                const item = allQualityList.filter(item => {
+                    return item.value == value;
+                })
+                if (item.length > 0) {
+                    return item[0].name
+                }
+                return false
+            }
+            const mchidArr = allMchid.map(item => {
+                return {
+                    name: findItem(item) || item,
+                    value: item,
+                    active: true
+                }
+            });
+
+
+            let mergeQualitys = [...mchidArr, ...allQualityList];
+
+            const newArr = [];
+            const obj = {};
+
+            for (let i = 0; i < mergeQualitys.length; i++) {
+                if (!obj[mergeQualitys[i].value]) {
+                    newArr.push(mergeQualitys[i]);
+                    obj[mergeQualitys[i].value] = true;
+                }
+            }
+
+            formatChannelTable(newArr);
+        }
+
         function formatChannelTable(tableData) {
+            $('#checkChannelContent').children().remove();
             let data;
             if (typeof tableData == 'object') {
                 data = tableData;
@@ -168,7 +213,7 @@
             data.map(item => {
                 tableHTML += `
                     <tr>
-                        <td><label><input type="checkbox" name="channelValue"" value="${item.value}" />${item.name}</label></td>
+                        <td><label><input type="checkbox" name="channelValue"" ${item.active?'checked="checked"':''} value="${item.value}" />${item.active?`<span style="color:red;">${item.name}</span>`:item.name}</label></td>
                     </tr>
                 `;
             })
@@ -178,6 +223,7 @@
         // let select_merchants
         $.get('index.php?act=refill_analysis&op=merchant_data', function(data) {
             data = JSON.parse(data)
+            qualitys = data;
             formatChannelTable(data)
             // select_merchants = xmSelect.render({
             //     el: '#select_merchants',
@@ -280,7 +326,11 @@
                 src += '&filter_wave=' + filter_wave;
             }
             $.get(src, function(data) {
-                $('#echart').html(data)
+                if (data.state == 'success') {
+                    $('#echart').html(`<img src='data:image/png;base64,${data.img}'/>`)
+                    allMchid = data.mchids;
+                    updateQualityTable()
+                }
             });
         });