增加主从表demo

Author: cq-panda

Vue.H5/src/Login.vue

@@ -1,43 +1,49 @@
 <template >
   <div class="login-container">
-    <vol-header :back="false" title="vol.vue-h5演示环境"></vol-header>
+    <vol-header :back="false"
+                title="vol.vue-h5演示环境"></vol-header>
     <h2>帐号登陆</h2>
     <div class="login-input">
-      <van-field
-        size="large"
-        v-model="userInfo.userName"
-        placeholder="请输入帐号"
-        type="text"
-        label="帐号"
-      />
-      <van-field
-        size="large"
-        v-model="userInfo.password"
-        placeholder="请输入密码"
-        type="password"
-        label="密码"
-      />
-      <van-field
-        v-model="userInfo.verificationCode"
-        center
-        clearable
-        label="验证码"
-        placeholder="请输入验证码"
-      >
+      <van-field size="large"
+                 v-model="userInfo.userName"
+                 placeholder="请输入帐号"
+                 type="text"
+                 label="帐号" />
+      <van-field size="large"
+                 v-model="userInfo.password"
+                 placeholder="请输入密码"
+                 type="password"
+                 label="密码" />
+      <van-field v-model="userInfo.verificationCode"
+                 center
+                 clearable
+                 label="验证码"
+                 placeholder="请输入验证码">
         <template #button>
-          <img @click="()=>{getVierificationCode()}" v-show="codeImgSrc!=''" :src="codeImgSrc" />
+          <img @click="()=>{getVierificationCode()}"
+               v-show="codeImgSrc!=''"
+               :src="codeImgSrc" />
         </template>
       </van-field>
     </div>
     <div class="login-btn">
-      <van-button @click="login()" v-show="!loading" block type="info">登陆</van-button>
-      <van-button disabled v-show="loading" block loading type="info" loading-text="正在登陆..." />
+      <van-button @click="login()"
+                  v-show="!loading"
+                  block
+                  type="info">登陆</van-button>
+      <van-button disabled
+                  v-show="loading"
+                  block
+                  loading
+                  type="info"
+                  loading-text="正在登陆..." />
     </div>
     <div class="login-account">
       <a>注册</a>
       <a>忘记密码</a>
     </div>
-    <van-divider class="login-line" dashed>其他方式登陆</van-divider>
+    <van-divider class="login-line"
+                 dashed>其他方式登陆</van-divider>
     <div class="login-other">
       <div class="item"></div>
       <div class="item">
@@ -60,12 +66,17 @@
 import { Field, Divider } from "vant";
 import VolHeader from "@/components/VolHeader.vue";
 export default {
+  watch: {
+    '$route' (to, from) {
+      console.log(to, from);
+    }
+  },
   components: {
     "vol-header": VolHeader,
     "van-field": Field,
     "van-divider": Divider
   },
-  data() {
+  data () {
     return {
       codeImgSrc: "",
       loading: false,
@@ -76,17 +87,17 @@ export default {
       }
     };
   },
-  created() {
+  created () {
     this.getVierificationCode();
   },
   methods: {
-    getVierificationCode() {
+    getVierificationCode () {
       this.http.get("/api/User/getVierificationCode").then(x => {
         this.codeImgSrc = "data:image/png;base64," + x.img;
         this.userInfo.UUID = x.uuid;
       });
     },
-    login() {
+    login () {
       if (this.userInfo.userName == "" || this.userInfo.userName.trim() == "")
         return this.$Message.error("请输入用户名");
       if (this.userInfo.password == "" || this.userInfo.password.trim() == "")
@@ -107,10 +118,11 @@ export default {
           return;
         }
         this.$store.commit("setUserInfo", x.data);
-        this.$router.push({ path: "/" });
+        let _lastPage = this.$store.getters.data().lastPage || '/';
+        this.$router.push({ path: _lastPage == '/login' ? '/' : _lastPage });
       });
     }
-  }
+  },
 };
 </script>
 <style lang="less" scoped>

Vue.H5/src/components/VolForm.vue

@@ -53,7 +53,7 @@
       </div>
     </van-actionsheet>
 
-    <div class="ds-from-content">
+    <div class="vol-from-content">
       <div style="display:none;">
         <van-field label-class="form-label"
                    :label-width="120"
@@ -602,7 +602,7 @@ export default {
     margin-right: -4px;
   }
 }
-.scroll .ds-from-content {
+.scroll .vol-from-content {
   //  height: calc(100vh - 50px);
   // overflow-y: scroll;
 }

Vue.H5/src/components/VolHeader.vue

@@ -8,7 +8,8 @@
                @click-right="onClickRight"
                :right-text="rightText">
     <template #right>
-      <van-icon name="search"
+      <van-icon v-show="showIcon"
+                name="search"
                 size="16" />
     </template>
   </van-nav-bar>
@@ -20,6 +21,10 @@
 import { NavBar, Icon } from "vant";
 export default {
   props: {
+    showIcon: {
+      type: Boolean,
+      default: true
+    },
     back: {
       type: Boolean,
       default: true

Vue.H5/src/components/VolVanUploader.vue

@@ -102,16 +102,18 @@ export default {
       var forms = new FormData();
       let _count = 0;
       _files.forEach((file) => {
-        this.bf = file.name + "压缩前大小:" + (file.size / 1024)
+       // this.bf = file.name + "压缩前大小:" + (file.size / 1024)
         var result = this.compress(file, (data) => {
           var _file = this.base64ToBlob(data);
           _count++;
-          this.af = file.name + "压缩后大小:" + (_file.size / 1024)
+        //  this.af = file.name + "压缩后大小:" + (_file.size / 1024)
           forms.append("fileInput", _file, file.name);
           if (_count == _files.length) {
             //"api/App_Expert/Upload"
             this.http.post(this.url, forms, true).then(x => {
-              console.log(x);
+               if(!x.status){
+                 return this.$toast(x.message)
+               }
               var _urls = _files.map(item => {
                 return { url: this.http.ipAddress + x.data + item.name };
               })
@@ -120,8 +122,6 @@ export default {
           }
         });
       });
-
-      // console.log(file)
     },
     beforeDelete (file, detail) {
       this.selfChange = true;

Vue.H5/src/router/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import store from '@/store'
 import doc from './doc'
+import { Form } from 'vant'
 const routerPush = Router.prototype.push
 Router.prototype.push = function push (location) {
   return routerPush.call(this, location).catch(error => { console.log(error) })
@@ -99,6 +100,21 @@ const router = new Router({
       }
     }
     ,
+    {
+      path: '/sellOrder',
+      name: 'SellOrder',
+      component: () => import('@/views/page/sellOrder/SellOrder.vue'),
+      meta: {
+      }
+    },
+    {
+      path: '/sellOrder/detail',
+      name: 'SellOrder_detail',
+      component: () => import('@/views/page/sellOrder/detail.vue'),
+      meta: {
+      }
+    }
+    ,
     {
       path: '/test',
       name: 'test',
@@ -113,15 +129,22 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   if (to.matched.length == 0) return next({ path: '/404' });
   store.dispatch("onLoading", true);
-
+  if (store.getters.data().lastPage && from.path != "/login" && to.path == "/login") {
+    store.getters.data().lastPage = "";
+    return next({ path: '/' });
+  }
   let navigate = store.getters.data().navigate;
   if (navigate && navigate.path.indexOf(to.path) != -1) {
     navigate.active = navigate.path.indexOf(to.path);
   }
 
+  if (to.path == "/login") {
+    store.getters.data().lastPage = from.path;
+  }
   if ((to.hasOwnProperty('meta') && to.meta.anonymous) || store.getters.isLogin()) {
     return next();
   }
+
   next({ path: '/login', query: { redirect: Math.random() } });
 })