跨店会员todo

pc/src/api/Navs.js

@@ -131,6 +131,16 @@ 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",
@@ -158,7 +168,7 @@ let navs = [
         "show": 2,
         "grouplist": "2,5",
         "icon": "el-icon-s-claim",
-    }, {
+    },  {
         "clmid": "15",
         "clmcode": "setting",
         "clmname": "系统设置",

pc/src/api/getApiRes.js

@@ -748,3 +748,24 @@ export function VipUserAssociatedPhoneStatusEdit(postdata) {
     let url = headapi + 'v1/User/VipUserAssociatedPhoneStatusEdit ';
     return getApiBasic(url, postdata);
 }
+
+// 12/3 跨店管理
+
+
+// 跨店会员查询
+export function AcrossVipUserQuery(postdata) {
+    let url = headapi + 'v1/User/AcrossVipUserQuery ';
+    return getApiBasic(url, postdata);
+}
+
+// 跨店会员删除
+export function AcrossVipUserDel(postdata) {
+    let url = headapi + 'v1/User/AcrossVipUserDel ';
+    return getApiBasic(url, postdata);
+}
+
+// 跨店会员添加
+export function AcrossVipUserAdd(postdata) {
+    let url = headapi + 'v1/User/AcrossVipUserAdd ';
+    return getApiBasic(url, postdata);
+}

pc/src/router/index.js

@@ -268,6 +268,14 @@ const routes = [
                     title: "关联手机",
                     clmid: "11",
                 }
+            },{
+                path: '/AcrossVip',
+                name: 'AcrossVip',
+                component: () => import('@/views/AcrossVip.vue'),
+                meta: {
+                    title: "跨店会员",
+                    clmid: "11",
+                }
             },
         ]
     }, {

tv/.idea/workspace.xml

@@ -23,36 +23,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/3pkbg.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/blueMvp.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/bluetit.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/pk.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/rank1.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/rank2.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/rank3.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/redMvp.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/redtit.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/yellowMvp.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/3pkRank/yellowtit.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/pk/yellowFlag.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/threepk/blueCube.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/threepk/redCube.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/threepk/threepkbg.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/img/threepk/yellowcube.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/views/3pkRank.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../pc/src/views/AcrossVip.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../pc/src/api/Navs.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/api/Navs.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../pc/src/api/getApiRes.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/api/getApiRes.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../pc/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/router/index.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Global.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/Global.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/assets/img/threepk/3pkbg.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Headside.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Headside.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/libs/rem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/libs/rem.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/3pk.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/threepk.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/Index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Main.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/Wait.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Wait.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/pk.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/pk.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/assets/img/3pk/3pkbg.png" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -65,47 +41,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/views/threepk.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="380">
-              <caret line="396" column="45" lean-forward="true" selection-start-line="396" selection-start-column="45" selection-end-line="396" selection-end-column="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/3pkRank.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="441">
-              <caret line="153" column="30" selection-start-line="153" selection-start-column="30" selection-end-line="153" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/2pkRank.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="462">
-              <caret line="38" column="20" selection-start-line="38" selection-start-column="20" selection-end-line="38" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/router/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="660">
-              <caret line="91" column="29" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" />
-              <folding>
-                <element signature="e#0#21#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -119,7 +55,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>.eight .user</find>
       <find>.eight .urt img</find>
       <find>three</find>
       <find>redSum</find>
@@ -140,7 +75,6 @@
       <find>rank1</find>
       <find>blueSum</find>
       <find>.name</find>
-      <find>redUnite</find>
       <find>CLEscore</find>
       <find>.blueUnite</find>
       <find>blue</find>
@@ -149,6 +83,8 @@
       <find>console.log(res);</find>
       <find>sta</find>
       <find>redMvp</find>
+      <find>2pkRank</find>
+      <find>redUnite</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
@@ -209,8 +145,8 @@
         <option value="$PROJECT_DIR$/src/libs/rem.js" />
         <option value="$PROJECT_DIR$/src/views/pk.vue" />
         <option value="$PROJECT_DIR$/src/router/index.js" />
-        <option value="$PROJECT_DIR$/src/views/3pkRank.vue" />
         <option value="$PROJECT_DIR$/src/views/threepk.vue" />
+        <option value="$PROJECT_DIR$/src/views/3pkRank.vue" />
       </list>
     </option>
   </component>
@@ -220,7 +156,7 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-2568" />
     <option name="y" value="-8" />
     <option name="width" value="1296" />
@@ -413,7 +349,7 @@
       <workItem from="1606196990553" duration="30160000" />
       <workItem from="1606548245045" duration="12000" />
       <workItem from="1606548419929" duration="30000" />
-      <workItem from="1606700588181" duration="59893000" />
+      <workItem from="1606700588181" duration="60600000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -555,14 +491,21 @@
       <option name="project" value="LOCAL" />
       <updated>1606972962641</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="2队PK 和 3队 PK">
+      <created>1607002197532</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1607002197532</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="368952000" />
+    <option name="totallyTimeSpent" value="369659000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-2568" y="-8" width="2576" height="1395" extended-state="6" />
+    <frame x="-2568" y="-8" width="2576" height="1395" extended-state="7" />
     <editor active="true" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" weight="0.2699362" />
@@ -651,7 +594,8 @@
     <MESSAGE value="pc part" />
     <MESSAGE value="chang img" />
     <MESSAGE value="tv build" />
-    <option name="LAST_COMMIT_MESSAGE" value="tv build" />
+    <MESSAGE value="2队PK 和 3队 PK" />
+    <option name="LAST_COMMIT_MESSAGE" value="2队PK 和 3队 PK" />
   </component>
   <component name="WindowStateProjectService">
     <state x="-1830" y="274" width="1099" height="859" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604022799787">
@@ -954,17 +898,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/3pkRank.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/threepk.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="153" column="30" selection-start-line="153" selection-start-column="30" selection-end-line="153" selection-end-column="30" />
+        <state relative-caret-position="380">
+          <caret line="396" column="45" lean-forward="true" selection-start-line="396" selection-start-column="45" selection-end-line="396" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/threepk.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/3pkRank.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="396" column="45" lean-forward="true" selection-start-line="396" selection-start-column="45" selection-end-line="396" selection-end-column="45" />
+        <state relative-caret-position="821">
+          <caret line="108" column="55" selection-start-line="108" selection-start-column="55" selection-end-line="108" selection-end-column="55" />
         </state>
       </provider>
     </entry>