add dev

src/App.vue

@@ -15,7 +15,11 @@ const { mapState: mapactivityState } = createNamespacedHelpers("vote");
 export default {
   data() {
     return {
-      showPage: true
+      showPage: true,
+      appid: {
+        prod: 'wx32e2e8c81f66070e',
+        dev: 'wx776f26b70b03902b',
+      },
     };
   },
   components: {
@@ -28,21 +32,21 @@ export default {
     })
   },
   created() {
-    // if (location.search && this.toolClass.UrlSearch(location.search).code) {
-    //   this.code = this.toolClass.UrlSearch(location.search).code
-    //   let oldCode = localStorage.getItem('code')
-    //   if (this.code === oldCode) {
-    //     localStorage.setItem('code', this.code)
-    //     this.toolClass.getCode('wx32e2e8c81f66070e')
-    //   } else {
-    //     localStorage.setItem('code', this.code)
-    //     this.getUser({code: this.code}).then(() => {
-    //       this.showPage = true
-    //     })
-    //   }
-    // } else {
-    //   this.toolClass.getCode('wx32e2e8c81f66070e')
-    // }
+    if (location.search && this.toolClass.UrlSearch(location.search).code) {
+      this.code = this.toolClass.UrlSearch(location.search).code
+      let oldCode = localStorage.getItem('code')
+      if (this.code === oldCode) {
+        localStorage.setItem('code', this.code)
+        this.toolClass.getCode(this.appid.dev)
+      } else {
+        localStorage.setItem('code', this.code)
+        this.getUser({code: this.code}).then(() => {
+          this.showPage = true
+        })
+      }
+    } else {
+      this.toolClass.getCode(this.appid.dev)
+    }
   },
   methods: {
     ...mapIndexActions(["getUser"])

src/util/api.js

@@ -1,4 +1,4 @@
-const baseUrl = '/api'
+const baseUrl = '/voteapi'
 
 const $api = {
   file: {

src/views/vote/index.vue

@@ -31,9 +31,9 @@ export default {
     this.getActivity({
       actid: this.actid,
     })
-    this.getMine({
-      actid: this.actid,
-    })
+    // this.getMine({
+    //   actid: this.actid,
+    // })
   },
   computed: {
     ...mapvoteState({

src/views/vote/list.vue

@@ -15,7 +15,13 @@
           <div slot="title">
             <span :class="{ [`theme${theme}`]: true, 'active': active }">最新上传</span>
           </div>
-          <pull-to :bottom-load-method="loadNewList">
+          <!-- <pull-to :bottom-load-method="loadNewList"> -->
+            <van-list
+              v-model="loading"
+              :finished="finished"
+              finished-text="没有更多了"
+              @load="loadNewList"
+            >
             <div class="LatestUpload">
               <div class="LatestUploadList" v-for="(item,index) in newList" :key="index">
                 <div :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2" @click="gotovotingdetails(item.MemberId)">
@@ -30,13 +36,20 @@
                 </div>
               </div>
             </div>
-          </pull-to>
+          <!-- </pull-to> -->
+            </van-list>
         </van-tab>
         <van-tab title="TOP50">
           <div slot="title">
             <span :class="{ [`theme${theme}`]: true, 'active': !active }">Top50</span>
           </div>
-            <pull-to :bottom-load-method="loadTopList">
+            <!-- <pull-to :bottom-load-method="loadTopList"> -->
+            <van-list
+              v-model="loading"
+              :finished="finished"
+              finished-text="没有更多了"
+              @load="loadTopList"
+            >
               <div class="LatestUpload">
                 <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
                   <div :class="signupBtn?ActivePersonnelBox1:ActivePersonnelBox2" @click="gotovotingdetails(item.MemberId)">
@@ -51,7 +64,8 @@
                   </div>
                 </div>
               </div>
-            </pull-to>
+              </van-list>
+            <!-- </pull-to> -->
         </van-tab>
       </van-tabs>
     </div>
@@ -61,7 +75,7 @@
 </template>
 
 <script>
-import PullTo from 'vue-pull-to'
+// import PullTo from 'vue-pull-to'
 import { createNamespacedHelpers } from "vuex";
 import wxsdk from "../../util/share.js";
 import toast from "../../components/toast.vue";
@@ -112,14 +126,16 @@ export default {
   },
   components: {
     toast,
-    PullTo
+    // PullTo
   },
   mounted() {
-    const scroll = window.scroll
-    window.addEventListener("scroll", (e) => {
-      scroll(e)
-      this.handleScroll()
-    }, true);
+    // const scroll = window.scroll
+    // window.addEventListener("scroll", (e) => {
+    //   scroll(e)
+    //   this.handleScroll()
+    // }, true);
+
+    window.addEventListener("scroll", this.handleScroll, true);
   },
   computed: {
     ...mapactivityState({
@@ -165,16 +181,16 @@ export default {
       actid: this.actid
     });
 
-    this.newlist().then((res) => {
-      if ((res || []).length === this.pageSize) {
-        this.newpage += 1
-      }
-    })
-    this.toplist().then((res) => {
-      if ((res || []).length === this.pageSize) {
-        this.toppage += 1
-      }
-    })
+    // this.newlist().then((res) => {
+    //   if ((res || []).length === this.pageSize) {
+    //     this.newpage += 1
+    //   }
+    // })
+    // this.toplist().then((res) => {
+    //   if ((res || []).length === this.pageSize) {
+    //     this.toppage += 1
+    //   }
+    // })
   },
   methods: {
     ...mapactivityActions([
@@ -240,7 +256,7 @@ export default {
         }
 
         this.loading = false;
-        loaded('done')
+        loaded && loaded('done')
       });
     },
     loadTopList(loaded) {
@@ -252,7 +268,7 @@ export default {
         }
 
         this.loading = false;
-        loaded('done')
+        loaded && loaded('done')
       });
     },
     signup() {

vue.config.js

@@ -5,16 +5,16 @@ module.exports = {
   chainWebpack: config => config.plugins.delete('named-chunks'),
   devServer: {
     proxy: {
-      '/api': {
+      '/voteapi': {
         // target: 'http://wechatconfigdev.ycjcjy.com',
         target: 'http://localhost:8080', // wf
         // target: 'http://192.168.0.102:8080', // hyq
         // target: 'http://192.168.0.11:8080', // zys
         // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
-        // pathRewrite: {
-        //   '^/api': '/api-v2/api'
-        // },
+        pathRewrite: {
+          '^/voteapi': '/api'
+        },
       },
     },
     // compress: true,