Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

package-lock.json

@@ -4578,6 +4578,12 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
     "default-require-extensions": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
@@ -15108,6 +15114,15 @@
         }
       }
     },
+    "vue-meta": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.3.1.tgz",
+      "integrity": "sha512-hnZvDNvLh+PefJLfYkZhG6cSBNKikgQyiEK8lI/P2qscM1DC/qHHOfdACPQ/VDnlaWU9VlcobCTNyVtssTR4XQ==",
+      "dev": true,
+      "requires": {
+        "deepmerge": "^4.0.0"
+      }
+    },
     "vue-mobile-calendar": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/vue-mobile-calendar/-/vue-mobile-calendar-3.3.0.tgz",

src/libs/host.js

@@ -12,9 +12,9 @@ function urlFun(name){
         /**
          * 默认公司
          */
-        // default:`http://192.168.4.67:5001`,
-        default:`https://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest`,
-        // default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`,
+        // default:`http://192.168.4.39:5001`,
+        // default:`https://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest`,
+        default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`,
 
         /**
          * 基本地址

src/view/tiip/chart/inventory.vue

@@ -4,7 +4,7 @@
         min-height:100%;
         display:flex;
         flex-direction: column;
-        background: #f2f2f2;
+        background: #DCE9FE;
         
         .Head{
             height:30px;

src/view/tiip/kanban/capital.vue

@@ -20,7 +20,7 @@
         <div class="card" v-if="list.length>0" v-for="(v,i) in list" :key="i" :style="{'--color':color[i%6]}">
             <div>
                 <div style="font-size:13px;margin-bottom:14px;">{{v.sName}}</div>
-                <div style="font-size: 28px;font-weight: 600;">{{Number(v.sValue)||0}}</div>
+                <div style="font-size: 28px;font-weight: 600;">{{Number(v.sValue||0).toLocaleString()}}</div>
             </div>
             <div style="align-self: flex-end;" v-if="v.rate!=0&&dateMode<5">
                 <div>{{v.rate>0?'↑':'↓'}}{{v.rate}}%</div>

src/view/tiip/kanban/index.vue

@@ -126,7 +126,7 @@
             <span :class="{active:situation=='abnormal'}" @click="situation='abnormal'">异常预警</span>
             <span :class="{active:situation=='tiipChartInventory'}" @click="situation='tiipChartInventory'">库存情况</span>
         </div>
-        <div class="content" :style="situation=='tiipChartInventory'&&'background:#fff;'">
+        <div class="content">
             <component :is="situation" :dateMode="dateMode" :start="DateValue[0]" :end="DateValue[1]"/>
         </div>
         <calendar 
@@ -209,6 +209,7 @@ export default {
             return date;
         },
         setMonth(date,val,mode){
+            console.log(date,val,mode,"----")
             date.setMonth(date.getMonth()+val)
             if(mode=='start'){
                 date.setDate(1)