Merge branch 'yun' of http://git.2weisou.com/Acher/newEdition into yun

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "AI销讲助手",
+    "name" : "AI销管",
     "appid" : "__UNI__7A1611D",
     "description" : "AI销讲助手",
     "versionName" : "1.1.0",
@@ -57,41 +57,23 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                    "hdpi" : "",
+                    "xhdpi" : "",
+                    "xxhdpi" : "",
+                    "xxxhdpi" : ""
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "",
                     "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
+                    "iphone" : {}
                 }
             }
         }
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx83fec12ec03d9349",
+        "appid" : "wxd6dd7eae72606ca2",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

pages/center/Piabodata/TrendAnalysis.vue

@@ -56,7 +56,12 @@
 					<view class="num" v-else>{{item.num||0}}</view>
 					<view class="comparesize" v-if="compareFlag&&timepickpickisshow">
 						<text style="margin-right: 50rpx;">对比：{{item.name==='平均执行率'?item.num1+'%':item.num1}}</text>
-						<text :style="{color:item.num2*1>0?'red':'green'}">{{item.num2+'%'}}{{(item.num2*1) > 0 ? '↑' : '↓'}}</text>
+						<text :style="{color:item.num2*1>0?'red':'green'}">
+						{{item.num2}}
+						<template v-if="item.name==='平均执行率'">
+							%
+						</template>
+						{{(item.num2*1) > 0 ? '↑' : '↓'}}</text>
 					</view>
 				</view>
 				<!-- <view class="grid" v-for="(item,index) in numlist" :key="index"
@@ -433,11 +438,12 @@
 						this.numlist[3].num1 = data.endSumCustomer
 						this.numlist[0].num1 = data.endFraction;
 						this.numlist[1].num1 = data.endSumDuration || 0;
-						this.numlist[2].num = data.endReceptionCount || 0
+						this.numlist[2].num1 = data.endReceptionCount || 0
 						this.numlist[3].num2 = data.contrastSumCustomer
 						this.numlist[0].num2 = data.contrastFraction;
 						this.numlist[1].num2 = data.contrastSumDuration || 0;
-						this.numlist[2].num = data.contrastReceptionCount || 0
+						this.numlist[2].num = data.startReceptionCount || 0
+						this.numlist[2].num2 = data.contrastReceptionCount || 0
 
 
 					} else {

utils/domain.js

@@ -1,7 +1,7 @@
 const base = 'http://81.70.55.170:9999' ;// 测试站
 // const base = 'http://8kdmng.natappfree.cc' ;// 佳豪
 // const base = 'http://192.168.31.86:9999' ;// 胜浩
-// const base = 'http://192.168.31.167:9999' // 长龙
+// const base = 'http://192.168.31.161:9999' // 长龙
 // const base = 'https://zanyong.hfju.com';// 正式 AI销管
 // const base = 'https://hxz.quhouse.com';// 正式 AI销讲助手