测试翻页问题

pc/src/views/Member.vue

@@ -511,14 +511,14 @@
                     token: localStorage.token,
                 };
                 let postdata = qs.stringify(param);
-                this.axios.post('/api/v1/QiNiu/GetSimpleQiNiuToken', postdata).then(res => {
+                this.axios.post( headapi + 'v1/QiNiu/GetSimpleQiNiuToken', postdata).then(res => {
                     const formdata = new FormData();
                     formdata.append('file', req.file);
                     formdata.append('token', res.data.QiNinToken);
                     formdata.append('key', keyname);
                     // 获取到凭证之后再将文件上传到七牛云空间
                     this.axios.post(this.domain, formdata, config).then(res => {
-                        this.imageUrl = 'http://' + this.qiniuaddr + '/' + res.data.key
+                        this.imageUrl = 'http://' + this.qiniuaddr + '/' + res.data.key;
                         this.form.head =  'http://' + this.qiniuaddr + '/' + keyname;
                     })
                 })
@@ -900,6 +900,7 @@
                     phone: that.form.phone,
                     name: that.form.name,
                     memo: that.form.memo,
+                    head: that.form.head,
                     height: that.form.height,
                     weight: that.form.weight,
                     staticHr: that.form.staticHr,

pc/src/views/heartEquipPerson.vue

@@ -130,9 +130,9 @@
             <div class="dialogContent">
                 <div class="">
                     <el-form ref="form" :model="form" label-width="160px">
-                        <el-form-item label="会员账号" :required="true">
+                        <el-form-item label="会员账号" :required="true"  >
                             <!--userId-->
-                            <el-select v-model="form.userId" placeholder="请选择" :disabled ="form.btnType == 1">
+                            <el-select v-model="form.userId" placeholder="请选择" :disabled ="form.btnType == 1" filterable>
                                 <el-option
                                         v-for="item in form.userList"
                                         :key="item.value"

tv/.idea/workspace.xml

@@ -22,28 +22,16 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/../pc/src/views/heartEquipPerson.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/Global.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/Global.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/components/upHead.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/components/upHead.vue" 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$/../pc/src/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Main.vue" afterDir="false" />
+    <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="测试翻页问题">
+      <change afterPath="$PROJECT_DIR$/src/views/test.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../pc/src/views/Member.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Member.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/courseEdit.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/courseEdit.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/courses.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/courses.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/heartEquip.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/heartEquip.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/record.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/record.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/vue.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/vue.config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../pc/src/views/heartEquipPerson.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/heartEquipPerson.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Headside.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Headside.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Global.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/Global.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/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/Rank.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Rank.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$/vue.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/vue.config.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -56,69 +44,56 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="527">
-              <caret line="63" column="56" selection-start-line="63" selection-start-column="56" selection-end-line="63" selection-end-column="56" />
-              <folding>
-                <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-377">
-              <caret line="61" selection-start-line="61" selection-end-line="61" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/vue.config.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="546">
-              <caret line="32" column="26" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="389">
-              <caret line="97" column="35" selection-start-line="97" selection-start-column="35" selection-end-line="97" selection-end-column="35" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="104" selection-start-line="104" selection-end-line="104" selection-end-column="14" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="322" column="55" lean-forward="true" selection-start-line="322" selection-start-column="55" selection-end-line="322" selection-end-column="55" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="168">
+                  <caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
+                  <folding>
+                    <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+                    <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="357">
+                  <caret line="57" column="68" lean-forward="true" selection-start-line="57" selection-start-column="68" selection-end-line="57" selection-end-column="68" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/views/test.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="42">
+                  <caret line="2" column="36" lean-forward="true" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/views/test.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="294">
+                  <caret line="14" column="26" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="26" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -132,12 +107,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>课程管理</find>
-      <find>mymove</find>
-      <find>timer</find>
-      <find>trueDate</find>
-      <find>that.autoplayStatus = true;</find>
-      <find>curin</find>
       <find>transition</find>
       <find>clearInterval</find>
       <find>curIndex</find>
@@ -149,7 +118,6 @@
       <find>.title</find>
       <find>recordMain h5</find>
       <find>loca</find>
-      <find>recordMain</find>
       <find>getClassUserRank</find>
       <find>千卡</find>
       <find>ClassStatQuery</find>
@@ -159,9 +127,16 @@
       <find>.three .topLi</find>
       <find>.max</find>
       <find>egg</find>
-      <find>xiakele</find>
-      <find>createEgg</find>
       <find>/bpi</find>
+      <find>110</find>
+      <find>createEgg</find>
+      <find>http://192.168.0.3:19096</find>
+      <find>xiakele</find>
+      <find>GetgetUserList</find>
+      <find>autoplayStatus</find>
+      <find>test</find>
+      <find>recordMain</find>
+      <find>:autoplay=&quot;autoplayStatus&quot;</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
@@ -191,7 +166,6 @@
         <option value="$PROJECT_DIR$/src/lib/rem.js" />
         <option value="$PROJECT_DIR$/src/assets/css/mainBk.css" />
         <option value="$PROJECT_DIR$/src/assets/css/mainBk2.css" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/main.js" />
         <option value="$PROJECT_DIR$/test.html" />
@@ -200,18 +174,20 @@
         <option value="$PROJECT_DIR$/src/App.vue" />
         <option value="$PROJECT_DIR$/src/views/gropePk.vue" />
         <option value="$PROJECT_DIR$/src/api/test.js" />
-        <option value="$PROJECT_DIR$/src/Global.js" />
         <option value="$PROJECT_DIR$/src/api/getApiRes.js" />
-        <option value="$PROJECT_DIR$/src/router/index.js" />
         <option value="$PROJECT_DIR$/src/assets/css/bg.css" />
         <option value="$PROJECT_DIR$/src/components/upimg.vue" />
         <option value="$PROJECT_DIR$/src/api/Navs.js" />
         <option value="$PROJECT_DIR$/src/components/Headside.vue" />
         <option value="$PROJECT_DIR$/src/views/pk.vue" />
         <option value="$PROJECT_DIR$/src/views/Rank.vue" />
-        <option value="$PROJECT_DIR$/src/views/Wait.vue" />
         <option value="$PROJECT_DIR$/src/views/Main.vue" />
         <option value="$PROJECT_DIR$/vue.config.js" />
+        <option value="$PROJECT_DIR$/src/Global.js" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/router/index.js" />
+        <option value="$PROJECT_DIR$/src/views/test.vue" />
+        <option value="$PROJECT_DIR$/src/views/Wait.vue" />
         <option value="$PROJECT_DIR$/src/views/Index.vue" />
       </list>
     </option>
@@ -225,8 +201,8 @@
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-2568" />
     <option name="y" value="-8" />
-    <option name="width" value="1294" />
-    <option name="height" value="696" />
+    <option name="width" value="1296" />
+    <option name="height" value="1395" />
   </component>
   <component name="ProjectId" id="1jXXjXdwK5v7WohMBoZDModntXR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -251,6 +227,12 @@
               <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
               <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
+            <path>
+              <item name="tv" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="views" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -356,7 +338,7 @@
       <workItem from="1605668164423" duration="15041000" />
       <workItem from="1605747566783" duration="13000" />
       <workItem from="1605775278675" duration="48765000" />
-      <workItem from="1606196990553" duration="11351000" />
+      <workItem from="1606196990553" duration="18104000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -463,23 +445,30 @@
       <option name="project" value="LOCAL" />
       <updated>1606125800099</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="升级链接使用正式版">
+      <created>1606269359713</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1606269359713</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="290208000" />
+    <option name="totallyTimeSpent" value="296961000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-2568" y="-8" width="2576" height="1395" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14393939" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.14393939" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.24973656" />
       <window_info id="Favorites" order="2" side_tool="true" weight="0.32982087" />
       <window_info id="npm" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32687446" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49920255" visible="true" weight="0.31508005" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49920255" weight="0.31508005" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.21468298" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -554,7 +543,8 @@
     <MESSAGE value="more and more" />
     <MESSAGE value="获取设备的uuid" />
     <MESSAGE value="test" />
-    <option name="LAST_COMMIT_MESSAGE" value="test" />
+    <MESSAGE value="升级链接使用正式版" />
+    <option name="LAST_COMMIT_MESSAGE" value="升级链接使用正式版" />
   </component>
   <component name="WindowStateProjectService">
     <state x="-1830" y="274" width="1099" height="859" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604022799787">
@@ -613,16 +603,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="483">
-            <caret line="23" column="39" lean-forward="true" selection-start-line="23" selection-start-column="39" selection-end-line="23" selection-end-column="39" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/babel.config.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -715,16 +695,6 @@
         <state relative-caret-position="-630" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/router/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="533">
-          <caret line="41" column="50" selection-start-line="41" selection-start-column="50" selection-end-line="41" selection-end-column="50" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/assets/css/bg.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1076">
@@ -769,13 +739,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Global.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="68" column="21" lean-forward="true" selection-start-line="64" selection-start-column="1" selection-end-line="68" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/components/Headside.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="433">
@@ -790,52 +753,86 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-377">
-          <caret line="61" selection-start-line="61" selection-end-line="61" />
+        <state relative-caret-position="189">
+          <caret line="322" column="55" lean-forward="true" selection-start-line="322" selection-start-column="55" selection-end-line="322" selection-end-column="55" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
+    <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="63" column="56" selection-start-line="63" selection-start-column="56" selection-end-line="63" selection-end-column="56" />
+        <state relative-caret-position="432">
+          <caret line="104" selection-start-line="104" selection-end-line="104" selection-end-column="14" />
           <folding>
-            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+            <element signature="e#0#26#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="483">
+            <caret line="23" column="2" selection-start-line="23" selection-start-column="2" selection-end-line="23" selection-end-column="2" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-377">
+          <caret line="61" selection-start-line="61" selection-end-line="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Global.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
-          <caret line="322" column="55" lean-forward="true" selection-start-line="322" selection-start-column="55" selection-end-line="322" selection-end-column="55" />
+          <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+    <entry file="file://$PROJECT_DIR$/vue.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="104" selection-start-line="104" selection-end-line="104" selection-end-column="14" />
+        <state relative-caret-position="420">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/router/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1407">
+          <caret line="68" column="31" selection-start-line="68" selection-start-column="31" selection-end-line="68" selection-end-column="31" />
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/vue.config.js">
+    <entry file="file://$PROJECT_DIR$/src/views/test.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="32" column="26" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
+        <state relative-caret-position="42">
+          <caret line="2" column="36" lean-forward="true" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
+          <folding>
+            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#s#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="97" column="35" selection-start-line="97" selection-start-column="35" selection-end-line="97" selection-end-column="35" />
+        <state relative-caret-position="357">
+          <caret line="57" column="68" lean-forward="true" selection-start-line="57" selection-start-column="68" selection-end-line="57" selection-end-column="68" />
         </state>
       </provider>
     </entry>

tv/README.md

@@ -1,18 +1,31 @@
-#PcBackStage
-
- /$$$$$$$           /$$$$$$$                      /$$        /$$$$$$   /$$                                  
-| $$__  $$         | $$__  $$                    | $$       /$$__  $$ | $$                                  
-| $$  \ $$ /$$$$$$$| $$  \ $$  /$$$$$$   /$$$$$$$| $$   /$$| $$  \__//$$$$$$    /$$$$$$   /$$$$$$   /$$$$$$ 
-| $$$$$$$//$$_____/| $$$$$$$  |____  $$ /$$_____/| $$  /$$/|  $$$$$$|_  $$_/   |____  $$ /$$__  $$ /$$__  $$
-| $$____/| $$      | $$__  $$  /$$$$$$$| $$      | $$$$$$/  \____  $$ | $$      /$$$$$$$| $$  \ $$| $$$$$$$$
-| $$     | $$      | $$  \ $$ /$$__  $$| $$      | $$_  $$  /$$  \ $$ | $$ /$$ /$$__  $$| $$  | $$| $$_____/
-| $$     |  $$$$$$$| $$$$$$$/|  $$$$$$$|  $$$$$$$| $$ \  $$|  $$$$$$/ |  $$$$/|  $$$$$$$|  $$$$$$$|  $$$$$$$
-|__/      \_______/|_______/  \_______/ \_______/|__/  \__/ \______/   \___/   \_______/ \____  $$ \_______/
-                                                                                         /$$  \ $$          
-                                                                                        |  $$$$$$/          
-                                                                                         \______/           
+#GoAllOut
+
+　　■■■　　　　　　　　　　　　　■■　　　　　　■■　　　　　　■■　　　　　■■■■　　　　　　　　　　　　　　　　　
+　　■　　■■　　　　　　　　　　　　■■　　　　　　■■　　　　　　■■　　　　■■　　■■　　　　　　　　　　　　　　　　
+　■　　　　■　　　　　　　　　　　　■■　　　　　　■■　　　　　　■■　　　　■　　　　■　　　　　　　　　　　　■　　　
+　■　　　　■　　　　　　　　　　　■■■■　　　　　■■　　　　　　■■　　　　■　　　　■　　　　　　　　　　　　■　　　
+　■　　　　　　　　■■■■　　　　■　　■　　　　　■■　　　　　　■■　　　　■　　　　■　　■　　　　■　　■■■■■　
+　■　　■■■　　■■　　■■　　　■　　■　　　　　■■　　　　　　■■　　　　■　　　　■　　■　　　　■　　　　■　　　
+　■　　　　■　　■　　　　■　　　■　　■　　　　　■■　　　　　　■■　　　　■　　　　■　　■　　　　■　　　　■　　　
+　■　　　　■　　■　　　　■　　■■■■■■　　　　■■　　　　　　■■　　　　■　　　　■　　■　　　　■　　　　■　　　
+　■　　　　■　　■　　　　■　　■　　　　■　　　　■■　　　　　　■■　　　　■　　　　■　　■　　　■■　　　　■　　　
+　■■　　■■　　■■　　■■　　■　　　　■　　　　■■　　　　　　■■　　　　■■　　■■　　■■　　■■　　　　■　　■
+　　　■■■■　　　■■■■　　■■　　　　■■　　　■■　　　　　　■■　　　　　■■■■　　　　■■■　■　　　　　■■■
+　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　
+　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　       
                                                                                          
-##常用的后台管理模板  
+##GoAllOut  for tv
+
+部署步骤
+
+1.获取设备的UUID
+    安装mefisto.getUUID app 写入区域列表
+
+2.
+
+
+
+
 
 小飞龙TV api服务
 http://192.168.0.162:9000/Hello

tv/src/Global.js

@@ -6,7 +6,8 @@ companyInfo = {
 };
 
 // headapi = process.env.NODE_ENV === 'development' ? '/api/' : '../';
-headapi = 'http://192.168.0.110:8080/';//从郑伟那里获得数据源
+// headapi = 'http://192.168.0.110:8080/';//从郑伟那里获得数据源
+headapi = '/api';//从郑伟那里获得数据源
 
 // 七牛云imgsrc
 imgUrl = "http://qjzpcd34v.hb-bkt.clouddn.com";

tv/src/router/index.js

@@ -60,6 +60,14 @@ const routes = [
                     title: "gropePk",
                     clmid: "4",
                 }
+            },{
+                path: '/test',
+                name: 'test',
+                component: () => import('@/views/test.vue'),
+                meta: {
+                    title: "test",
+                    clmid: "999",
+                }
             },
         ]
     }, {

tv/src/views/Index.vue

@@ -52,7 +52,11 @@
                     plus.runtime.getProperty(plus.runtime.appid, function (inf) {
                         localStorage.version = inf.version;
                         that.curVersion = inf.version;
-                        that.checkUpdate( that.curVersion);
+
+                        //首发版本1.0.1
+                        console.log( localStorage.version);
+                        that.checkUpdate( that.curVersion); //开启自动升级
+
                     });
 
                     //   获取手机UUID
@@ -69,6 +73,7 @@
                             // });
                             // 8e501b0bde9ce600
                             // 打印uuid
+                            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid))
                             console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
                         },
                         fail: function (e) {
@@ -96,7 +101,7 @@
                     let json = res;
                     if (json.Code == 0) {
                         if (version != json.Version) {
-                            let url = "http://cal.beswell.com:85//v1/Sensors/DownloadVueFramework";
+                            let url = "http://cal.beswell.com:85/v1/Sensors/DownloadVueFramework";
                             that.downWgt(url, json.Version);
                             that.$notify({
                                 title: '升级提醒',

tv/src/views/Wait.vue

@@ -4,9 +4,9 @@
         <div class="rankContainer">
             <div class="lt">
                 <div class="recordMain">
-                    <el-carousel :interval="30000" height="370px" :autoplay="autoplayStatus" :initial-index="1">
+                    <el-carousel :interval="30000" height="370px" >
                         <el-carousel-item v-for="rs in recordMain">
-                            <div v-show="t == curIndex" v-for="(rs,t) in recordMain" v-bind:key="t">
+                            <div>
                                 <h5 v-html="rs.Title"></h5>
                                 <div class="sumContainer">
                                     <div class="sum">
@@ -20,7 +20,7 @@
                     </el-carousel>
                 </div>
                 <div class="bottom">
-                    <el-carousel :interval="15000" height="280px" :autoplay="autoplayStatus" :initial-index="1">
+                    <el-carousel :interval="15000" height="280px" >
                         <el-carousel-item v-for="Rs in bottom">
                             <div class="topOne" v-if="Rs.Style == 'tops'">
                                 <h5>{{Rs.Title}}</h5>
@@ -71,7 +71,7 @@
                 </div>
             </div>
             <div class="rt">
-                <el-carousel :interval="15000" height="610px" :autoplay="autoplayStatus" :initial-index="1">
+                <el-carousel :interval="15000" height="610px" >
                     <el-carousel-item v-for="Rs in rt">
                         <h5>{{Rs.Title}}</h5>
                         <ul>
@@ -140,9 +140,10 @@
             }
         },
         mounted() {
+            this.autoplayStatus = false;
             if (this.trueDate) {
                 this.getcurIndex = setInterval(() => {
-                    this.curIndex = this.curIndex == 0 ? 1 : 0;
+                    // this.curIndex = this.curIndex == 0 ? 1 : 0;
                 }, 3000);
 
                 this.waitTimer = setInterval(() => {
@@ -152,8 +153,6 @@
                     this.GetCalorieStatsQuery();
                     this.GetUserRankingQuery();
                 }, 1000);
-
-                this.autoplayStatus = true;
             } else {
                 this.students = this.fakeNews();
                 this.studentsLimit = this.fakeNewsLimit();
@@ -225,11 +224,11 @@
                 this.recordMain = [
                     {
                         Title: '本<s>周</s>场馆卡路里总消耗',
-                        Result: [{'Values': 1234, Unite: '千卡'}],
+                        Result: [{'Values': 0, Unite: '千卡'}],
                     },
                     {
                         Title: '本<s>周</s>场馆卡路里总消耗',
-                        Result: [{'Values': 1234, Unite: '千卡'}],
+                        Result: [{'Values': 0, Unite: '千卡'}],
                     }
                 ]
             }
@@ -298,7 +297,6 @@
                     if (json.Code == 0) {
                         that.topMsg = json.Rs[0];
                         that.students = json.Rs;
-                    } else {
                         that.$message.error(json.Memo);
                     }
                 })
@@ -402,6 +400,7 @@
         watch: {
             '$route': function (val) {
                 if (val.path == '/wait') {
+                    this.autoplayStatus = false;
                     if (this.trueDate) {
                         this.waitTimer = setInterval(() => {
                             this.curgetClassStat();
@@ -410,7 +409,7 @@
                             this.GetUserRankingQuery();
                         }, 1000);
 
-                        this.autoplayStatus = true;
+
                     } else {
                         this.students = this.fakeNews();
                         this.topMsg = this.students[0];

tv/src/views/test.vue

@@ -0,0 +1,46 @@
+<template>
+    <div class="block">
+        <el-carousel height="150px">
+            <el-carousel-item v-for="rs in recordMain" >
+                <h3 class="small">{{ rs.Title }}</h3>
+            </el-carousel-item>
+        </el-carousel>
+    </div>
+</template>
+
+<script>
+    export default {
+        data(){
+            return {
+                recordMain: [
+                    {
+                        Title: '*123123*',
+                        Result: [{'Values': 33, Unite: '12'}],
+                    },
+                    {
+                        Title: '*******',
+                        Result: [{'Values': 0, Unite: '千卡'}],
+                    }
+                ],
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+    .carcontent {
+        width: 100%;
+        overflow: hidden;
+        /*display: block;*/
+        /*margin: 0 auto;*/
+        height: 400px;
+        background: #409EFF;
+    }
+ .cubes {
+     height: 400px;
+     /*overflow: hidden;*/
+     /*display: block;*/
+     margin: 0 auto;
+ }
+</style>