backup

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

pc/src/Global.js

@@ -263,9 +263,9 @@ turnResToOption = function (data) {
             key: parseInt(item.UserInfo.Id),
             value: parseInt(item.UserInfo.Id),
         }
-    })
+    });
     return ids
-}
+};
 
 turnResToOptionByViper = function (data) {
     if (!data) return false;

pc/src/api/Navs.js

@@ -131,16 +131,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-setting",
     },
-    {
-        "clmid": "11",
-        "clmcode": "log",
-        "clmname": "跨店会员",
-        "clmurl": "/AcrossVip",
-        "prname": "",
-        "show": 2,
-        "grouplist": "2,5",
-        "icon": "el-icon-user-solid",
-    },
+
     {
         "clmid": "12",
         "clmcode": "shop",
@@ -150,7 +141,17 @@ let navs = [
         "show": 2,
         "grouplist": "2,5",
         "icon": "el-icon-s-shop",
-    }, {
+    },
+    {
+        "clmid": "11",
+        "clmcode": "log",
+        "clmname": "跨店会员",
+        "clmurl": "/AcrossVip",
+        "prname": "",
+        "show": 2,
+        "grouplist": "2,5",
+        "icon": "el-icon-user-solid",
+    },{
         "clmid": "13",
         "clmcode": "adminManage",
         "clmname": "管理员管理",

pc/src/api/getApiRes.js

@@ -769,3 +769,10 @@ export function AcrossVipUserAdd(postdata) {
     let url = headapi + 'v1/User/AcrossVipUserAdd ';
     return getApiBasic(url, postdata);
 }
+// 12/4 会员基本信息foradmin
+
+// 跨店会员添加
+export function VipUserSimpleQueryByAdmin(postdata) {
+    let url = headapi + 'v1/User/VipUserSimpleQueryByAdmin ';
+    return getApiBasic(url, postdata);
+}

tv/src/views/pk.vue

@@ -313,7 +313,7 @@
 
                 // pkVal
                 let sumMax = parseFloat(redSum) + parseFloat(blueSum);
-                that.pkVal = (redSum / sumMax) * 100 + '%';
+                that.pkVal = parseFloat((redSum / sumMax) * 100).toFixed(2) + '%';
             },
             // 获取上课学生信息
             GetgetUserList() {