云仓一期，二期，并作为云仓基础版

src/api/module/brand/brand.js

+import request from '@/utils/request';
+// 获取品牌列表
+export function getBrandsInf(query) {
+  return request({
+    url: '/local/brands',
+    method: 'get',
+    params: query
+  });
+}
+
+// 新增品牌
+export function addBrand(data) {
+  return request({
+    url: '/local/brands',
+    method: 'post',
+    data: data
+  });
+}
+
+// 获取品牌详情
+export function getDetails (id) {
+  return request({
+    url: '/local/brandsInfo?id='+id,
+    method: 'get'
+  })
+}
+
+// 修改品牌信息
+export function upBrand(data) {
+  return request({
+    url: '/local/upbrands',
+    method: 'post',
+    data: data
+  });
+}
+
+// 上传图片
+export function upLoadImg (data) {
+  return request({
+    url: '/system/goods/uploadImg',
+    method: 'post',
+    data: data
+  });
+}

src/api/module/brand/index.js

+import request from '@/utils/request';
+

src/api/module/entry.js

+import request from '@/utils/request';
+
+// 获取主体信息
+export function getMainInf(query) {
+  return request({
+    url: '/local/getOrganization',
+    method: 'get',
+    params: query
+  });
+}
+
+// 新建主体信息
+export function addMain(data) {
+  return request({
+    url: '/local/organization',
+    method: 'post',
+    data: data
+  })
+}
+// 获取品牌信息
+export function getBrandsInf(query) {
+  return request({
+    url: '/local/brands',
+    method: 'get',
+    params: query
+  });
+}
+
+// 新建品牌信息
+export function addBrands(data) {
+  return request({
+    url: '/local/brands',
+    method: 'post',
+    data: data
+  });
+}
+// 修改品牌信息
+export function upBrands(data) {
+  return request({
+    url: '/local/upbrands',
+    method: 'post',
+    data: data
+  });
+}
+
+// 获取店铺信息
+export function getShopInf(query) {
+  return request({
+    url: '/local/getShopInfo',
+    method: 'get',
+    params: query
+  });
+}
+// 提交店铺信息
+export function addShopInf(data) {
+  return request({
+    url: '/local/addShopInfo',
+    method: 'post',
+    data: data
+  });
+}
+
+// 上传图片
+export function upLoadImg (data) {
+  return request({
+    url: '/system/goods/uploadImg',
+    method: 'post',
+    data: data
+  });
+}
+// 获取商品类目
+export function getGoodsType(query) {
+  return request({
+    url: '/local/cate',
+    method: 'get',
+    params: query
+  });
+}

src/api/module/order.js

@@ -34,6 +34,15 @@ export function getExpressInfo(data){
   })
 }
 
+// 获取 所有物流信息
+export function getExpressList(query) {
+  return request({
+    url: '/system/order/expressList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 新增order
 export function addOrder(data) {
     return request({

src/api/module/retreat.js

@@ -44,3 +44,4 @@ export function retreatSubmit(data) {
 //         data:{ids:ids}
 //     })
 // }
+

src/api/module/retreat/address.js

+import request from '@/utils/request';
+
+// 获取 售后地址列表
+export function getAddressList(query) {
+  return request({
+    url: '/local/shopRefundAddress/list',
+    method: 'get',
+    params: query
+  });
+}
+
+// 新增/修改售后地址
+export function addAddress(data) {
+  return request({
+    url: '/local/shopRefundAddress/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取售后地址详情
+export function getAddressDetails (id) {
+  return request({
+    url: '/local/getRefundAddressInfo?id='+id,
+    method: 'get'
+  })
+}
+
+// 删除售后地址
+export function deleteAddress (id) {
+  return request({
+    url: '/local/delRefundAddress?id='+id,
+    method: 'get'
+  })
+}
+
+// 获取省市区地址
+export function getAreaList(query) {
+  return request({
+    url: '/local/provinceCity/list',
+    method: 'get',
+    params: query
+  });
+}
+
+
+//

src/layout/components/Navbar.vue

@@ -4,6 +4,9 @@
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
+    <div style="position:fixed;height: 100%;line-height: 50px;font-size:16px; right: 100px;">
+      <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>
+    </div>
     <div class="right-menu">
      <!-- <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
@@ -24,6 +27,7 @@
 
       </template> -->
 
+
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">

src/permission.js

@@ -15,7 +15,6 @@ router.beforeEach((to, from, next) => {
   if (getToken()) {
     /* has token*/
     if (to.path === '/login') {
-      // console.log(555)
       return false
       next({ path: '/' })
       NProgress.done()
@@ -36,17 +35,13 @@ router.beforeEach((to, from, next) => {
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
-        })
-        // console.log(666)
-          .catch(err => {
-            // console.log(5555)
+        }).catch(err => {
             store.dispatch('FedLogOut').then(() => {
               Message.error(err)
               next({ path: '/' })
             })
           })
       } else {
-// console.log(222)
         next()
         // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
         // if (hasPermission(store.getters.roles, to.meta.roles)) {

src/router/index.js

@@ -5,7 +5,7 @@ Vue.use(Router)
 
 /* Layout */
 import Layout from '@/layout';
-import Entry from '@/views/entry';
+// import Entry from '@/views/entry';
 
 
 
@@ -60,6 +60,12 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  // 总体流程
+  {
+    path: '/process',
+    component: (resolve) => require(['@/views/entry/process'], resolve),
+    hidden: true
+  },
   // 阅读协议
   {
     path: '/agreement',
@@ -93,25 +99,13 @@ export const constantRoutes = [
   // 审核失败
   {
     path: '/reviewFail',
+    name: 'reviewFail',
     component: (resolve) => require(['@/views/entry/reviewFail'], resolve),
     hidden: true
   },
-  /*{
-    path: '',
-    component: Layout,
-    redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
-        name: '首页',
-        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-      }
-    ]
-  },*/
   {
     path: '',
-    component: Entry,
+    component: Layout,
     redirect: 'index',
     children: [
       {
@@ -188,6 +182,34 @@ export const constantRoutes = [
       }
     ]
   },
+  /* 正式上线需要  注释 */
+  {
+    path: '/brand',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'fields',
+        component: (resolve) => require(['@/views/system/shop/brand'], resolve),
+        name: 'modelFields',
+        meta: { title: '品牌管理' }
+      }
+    ]
+  },
+  {
+    path: '/address',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'fields',
+        component: (resolve) => require(['@/views/system/retreat/address'], resolve),
+        name: 'modelFields',
+        meta: { title: '售后地址' }
+      }
+    ]
+  },
+  /**/
 ]
 
 export default new Router({

src/store/index.js

@@ -6,6 +6,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import entryState from './modules/entryState'
 
 Vue.use(Vuex)
 
@@ -15,7 +16,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    entryState
   },
   getters
 })

src/store/modules/entryState.js

+const entryState = {
+  state: {
+    type: 0
+  }
+}
+
+export default entryState;

src/store/modules/user.js

@@ -53,9 +53,7 @@ const user = {
     Login({ commit }, tickets) {
       const ticket = tickets.ticket
       return new Promise((resolve, reject) => {
-        console.log("Promise")
         login2(tickets).then(res => {
-          console.log("res.data.token",res.data.token)
           setToken(res.data.token)
           commit('SET_TOKEN', res.data.token)
           resolve(res.data)
@@ -69,12 +67,9 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-			// console.log("res.data",res.data)
           const user = res.data.user
           // const avatar = user.avatar == "" ? require("@/assets/image/login-background.jpg") : process.env.VUE_APP_BASE_API +"/"+ user.avatar;
           const avatar = require("@/assets/image/login-background.jpg")
-          console.log("user111",user)
-// return false
           if (res.data.Role && res.data.Role.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
             commit('SET_PERMISSIONS', res.data.permissions)
@@ -82,7 +77,6 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.Username)
-
           commit('SET_SELLERID', user.SellerId)
           commit('SET_AVATAR', avatar)
           resolve(res)
@@ -94,7 +88,6 @@ const user = {
 
     // 退出系统
     LogOut({ commit, state }) {
-      console.log("LogOut")
       return new Promise((resolve, reject) => {
         logout().then(() => {
           commit('SET_TOKEN', '')
@@ -110,7 +103,6 @@ const user = {
              }
             // }, 1000)
 
-
           resolve()
         }).catch(error => {
           reject(error)

src/utils/request.js

 import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
+import {Notification, MessageBox, Message} from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
@@ -19,10 +19,11 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  //config.headers['Authorization'] = 'Bearer ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbk5hbWUiOiIxNTcxMTEzOTg5NSIsInVpZCI6NTI4MjgsImNoYW5uZWxJZCI6MCwiZXhwIjoxNjE5NTEyMzI0LCJpc3MiOiJnaW4tYmxvZyJ9.1I74xBUHyu_XIc7BggNMpxRUGGZnGJEEvElD85xxIPY'
   return config
 }, error => {
-    console.log(error)
-    Promise.reject(error)
+  console.log("25reject");
+  Promise.reject(error);
 })
 
 // 响应拦截器
@@ -31,6 +32,7 @@ service.interceptors.response.use(res => {
     const code = res.data.code || 200;
     // 获取错误信息
     const message = errorCode[code] || res.data.msg || errorCode['default']
+
     if (code === 401 || code == 99999) {
       MessageBox.confirm(
         '登录状态已过期，您可以继续留在该页面，或者重新登录',
@@ -45,49 +47,62 @@ service.interceptors.response.use(res => {
           location.reload() // 为了重新实例化vue-router对象 避免bug
         })
       })
-    }else if (code === 500) {
+    } else if (code === 500) {
       Message({
-        message: message,
+        message: "状态吗500",
+        // message: message,
         type: 'error'
       })
-       console.log("q500")
       return Promise.reject(new Error(message))
-    } else if (code !== 200) {
-      console.log("q200")
+    } else if (code !== 200 && code !== 1) {
       Notification.error({
         title: message
       })
       return Promise.reject('error')
       store.dispatch('LogOut').then(() => {
-        var ssa = window.location.host
+        var ssa = window.location.host;
         // setTimeout(function (){
-         if(ssa =='localhost:1024'){
-           window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa
-         }else{
-          window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa
-         }
+        if (ssa == 'localhost:1024') {
+          window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
+        } else {
+          window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
+        }
         // }, 1000)
         // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
-    }else {
+    } else if (code === 200) {
       return res.data
     }
-  },
-  error => {
-    var ssa = window.location.host
-    setTimeout(function (){
-     if(ssa =='localhost:1024'){
-       window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa
-     }else{
-      window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa
-     }
-    }, 1000)
+  }, error => {
+    // --- start ---- 开发时候用这段，把错误彻底抛出来 --- start ---
+    // let {message} = error;
+    // if (message == 'Network Error') {
+    //   message = "后端接口连接异常";
+    // } else if (message.includes('timeout')) {
+    //   message = '系统接口请求超时';
+    // } else if (message.includes("Request failed with status code")) {
+    //   message = "系统接口" + message.substr(message.length - 3) + "异常";
+    // }
     // Message({
-    //   message: error.message,
-    //   type: 'error',
-    //   duration: 5 * 1000
-    // })
-    // return Promise.reject(error)
+    //   message: message,
+    //   type: "error"
+    // });
+    // console.log(message);
+    // --- end ---- 开发时候用这段，把错误彻底抛出来 --- end ---
+
+    // --- start --- 正式上线，隐藏报错信息 ----- start ----
+
+    let ssa = window.location.host;
+    setTimeout(function () {
+      if (ssa == 'localhost:1024') {
+        window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
+      } else {
+        window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
+      }
+    }, 1000);
+
+    // --- end  --- 正式上线，隐藏报错信息 ----- end ----
+    return Promise.reject(error)
   }
 )
 

src/utils/ruoyi.js

@@ -131,4 +131,3 @@ export function handleTree(data, id, parentId, children, rootId) {
 	});
 	return treeData != '' ? treeData : data;
   }
-  
\ No newline at end of file

src/views/entry/reviewFail.vue

@@ -3,26 +3,32 @@
     <div class="logo-bg">
       <img src="../../../public/images/logo_white_sm.png" alt="">
     </div>
-    <div class="steps">
-      <el-steps :active="4" align-center finish-status="success" process-status="error">
-        <el-step title="仔细阅读并同意入驻协议"></el-step>
-        <el-step title="填写主体信息"></el-step>
-        <el-step title="填写品牌信息"></el-step>
-        <el-step title="填写店铺信息"></el-step>
-        <el-step title="提交审核，等待结果"></el-step>
-      </el-steps>
-    </div>
-    <div class="main">
-      <div class="fuck">
-        <p>
-          <img src="../../../public/images/entry/reviewFail.png" alt="">
-        </p>
-        <p>非常抱歉，您的资料审核不通过！</p>
-        <p>不通过原因：企业主体信息与事实不符合。请您重新提交认证资料！</p>
-        <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系</p>
-        <p>服务电话：010-31415689</p>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix steps">
+        <el-steps :active="4" align-center finish-status="success" process-status="error">
+          <el-step title="签署入驻协议"></el-step>
+          <el-step title="填写主体信息"></el-step>
+          <el-step title="填写品牌信息"></el-step>
+          <el-step title="填写店铺信息"></el-step>
+          <el-step title="提交入驻审核"></el-step>
+        </el-steps>
       </div>
-    </div>
+      <div class="main">
+        <div class="main-con">
+          <p>
+            <img src="../../../public/images/entry/reviewFail.png" alt="">
+          </p>
+          <p>非常抱歉，您的资料审核不通过！</p>
+          <p>不通过原因：{{ msg }}！请您重新提交认证资料！</p>
+          <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系</p>
+          <p>服务电话：4000-188-199</p>
+          <p style="padding-top: 40px;"><el-button type="primary" @click="reSubmit">重新提交</el-button></p>
+        </div>
+
+      </div>
+    </el-card>
+
+
   </div>
 </template>
 
@@ -30,7 +36,20 @@
   export default {
     name: "ReviewFail",
     data() {
-      return {}
+      return {
+        msg: '具体原因，请联系售后'
+      }
+    },
+    mounted() {
+      if(this.$route.params.msg) {
+        this.msg = this.$route.params.msg;
+      }
+    },
+    methods: {
+      // 重新提交审核
+      reSubmit() {
+        this.$router.push({path: '/process'});
+      }
     }
   }
 </script>
@@ -48,14 +67,21 @@
         margin: 8px 0 8px 20px;
       }
     }
+    .box-card {
+      width: 80%;
+      margin: 30px auto 30px;
+      height: calc(100% - 120px);
+
+    }
     .steps {
       height: 70px;
       width: 60%;
-      margin: 40px auto 0;
+      margin: 20px auto 20px;
     }
     .el-step >>> .el-step__title {
       font-size: 16px;
-      line-height: 58px;
+      line-height: 18px;
+      padding-top: 20px;
       color: #333;
     }
     //#13ce66
@@ -93,7 +119,7 @@
       width: 100%;
       height: calc(66% - 120px);
       display:table;
-      .fuck {
+      .main-con {
         display:table-cell;
         vertical-align:middle;
         p {

src/views/entry/reviewing.vue

@@ -3,27 +3,29 @@
     <div class="logo-bg">
       <img src="../../../public/images/logo_white_sm.png" alt="">
     </div>
-    <div class="steps">
-      <el-steps :active="4" align-center finish-status="success">
-        <el-step title="仔细阅读并同意入驻协议" ></el-step>
-        <el-step title="填写主体信息" ></el-step>
-        <el-step title="填写品牌信息" ></el-step>
-        <el-step title="填写店铺信息" ></el-step>
-        <el-step title="提交审核，等待结果" ></el-step>
-      </el-steps>
-    </div>
-    <div class="main">
-      <div class="fuck">
-        <p>
-          <img src="../../../public/images/entry/reviewSuccess.png" alt="">
-        </p>
-        <p>资料已提交，工作人员审核中。。。</p>
-        <p>感谢您使用云仓！</p>
-        <p>您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。</p>
-        <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系！</p>
-        <p>服务电话：010-31415689</p>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix steps">
+        <el-steps :active="4" align-center finish-status="success">
+          <el-step title="签署入驻协议" ></el-step>
+          <el-step title="填写主体信息" ></el-step>
+          <el-step title="填写品牌信息" ></el-step>
+          <el-step title="填写店铺信息" ></el-step>
+          <el-step title="提交入驻审核" ></el-step>
+        </el-steps>
       </div>
-    </div>
+      <div class="main">
+        <div class="fuck">
+          <p>
+            <img src="../../../public/images/entry/reviewSuccess.png" alt="">
+          </p>
+          <p>资料已提交，工作人员审核中。。。</p>
+          <p>感谢您使用云仓！</p>
+          <p>您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。</p>
+          <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系！</p>
+          <p>服务电话：4000-188-199</p>
+        </div>
+      </div>
+    </el-card>
   </div>
 </template>
 
@@ -49,6 +51,11 @@
       margin: 8px 0 8px 20px;
     }
   }
+  .box-card {
+    width: 80%;
+    margin: 30px auto 30px;
+    height: calc(100% - 120px);
+  }
   .steps {
     height: 70px;
     width: 60%;
@@ -56,7 +63,8 @@
   }
   .steps >>> .el-step__title {
     font-size: 16px;
-    line-height: 58px;
+    line-height: 18px;
+    padding-top: 20px;
     color: #333;
   }
 

src/views/index.vue

@@ -92,6 +92,7 @@ const lineChartData = {
   newVisitis: {
     expectedData: [100, 120, 161, 134, 105, 160, 161],
     actualData: [120, 82, 91, 154, 162, 140, 145]
+    // 退出登录
   },
   // messages: {
   //   expectedData: [200, 192, 120, 144, 160, 130, 140],

src/views/login2.vue

 <template>
 </template>
 <script>
+  import { Notification } from 'element-ui';
+  import { getShopInf } from '@/api/module/entry';
+  import request from '@/utils/request'
   export default {
     name: "Login2",
     created() {
-      this.gotosso()
+      this.gotosso();
     },
     methods: {
-
-      getCookie() {
-        var de = this.$store.commit("SET_TOKEN")
-      },
       gotosso() {
-        var ticket = this.$route.query.ticket
+        var ticket = this.$route.query.ticket;
         this.$store.dispatch('Login', {"ticket": ticket}).then((res) => {
           if (res.token != "") {
-            this.$router.push({path: '/'})
+            // 获取客户是否有审核信息
+            getShopInf().then(res => {
+              if(res.code === 1) {
+                switch(res.data.state) {
+                  case 0:
+                    switch(res.data.status){
+                      case(0):
+                        this.$router.push({path: '/process'});
+                        break;
+                      case(1):
+                        this.$router.push({path: '/fillBrandInf'});
+                        break;
+                      case(2):
+                        this.$router.push({path: '/fillShopInf',});
+                        break;
+                    }
+                    break;
+                  case 1: // 审核成功，要跳转到首页
+                    this.$router.push({path: '/'});
+                    break;
+                  case 2: // 审核中
+                    this.$router.push({path: '/reviewing'});
+                    break;
+                  case 3: // 审核失败
+                    let msg = res.data.Apply.content;
+                    this.$router.push({
+                      name: 'reviewFail',
+                      params: { msg: msg }
+                    });
+                    break;
+                }
+              }else {
+                if(res && res.msg) {
+                  Notification.error({
+                    title: '提示：',
+                    message: res.msg
+                  })
+                }else {
+                  Notification.error({
+                    title: '提示：',
+                    message: '刷新浏览器后，再次登录，若仍不行，请联系我们！'
+                  })
+                }
+              }
+            });
+
           } else {
             this.$store.dispatch('Statistic')
             this.$store.dispatch('FedLogOut')
-            var ssa = window.location.host
+            var ssa = window.location.host;
             setTimeout(function () {
               if (ssa == 'localhost:1024') {
                 window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa + '/login'

src/views/system/asset/balance/index.vue

 <template>
   <div class="app-container">
     <el-card class="box-card">
-    <div slot="header" class="clearfix">
+      <div slot="header" class="clearfix">
         <span>结算流水</span>
-
-    </div>
-    <el-table v-loading="loading" :height="tableHeight"  :data="assetList">
-      <el-table-column label="ID" align="center" prop="Id" />
-      <el-table-column label="流水订单号" align="center" prop="BalanceSn" />
-      <el-table-column label="变动金额" align="center" :formatter="formatMoney" prop="ChangeMoney" />
-      <el-table-column label="变动类型" align="center" :formatter="formatType" prop="ChangeType" />
-      <el-table-column label="时间" align="center" :formatter="formatTime" prop="AddTime" />
-      <el-table-column label="描述" align="center" prop="Des" />
-    </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
-</el-card>
+      </div>
+      <el-table v-loading="loading" :height="tableHeight" :data="assetList">
+        <el-table-column label="ID" align="center" prop="Id"/>
+        <el-table-column label="流水订单号" align="center" prop="BalanceSn"/>
+        <el-table-column label="变动金额" align="center" :formatter="formatMoney" prop="ChangeMoney"/>
+        <el-table-column label="变动类型" align="center" :formatter="formatType" prop="ChangeType"/>
+        <el-table-column label="时间" align="center" :formatter="formatTime" prop="AddTime"/>
+        <el-table-column label="描述" align="center" prop="Des"/>
+      </el-table>
+      <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                  @pagination="getList"/>
+    </el-card>
   </div>
 </template>
 <script>
@@ -29,13 +28,12 @@
   import {
     dateFormat
   } from '@/utils'
-
   export default {
     name: "asset",
     data() {
       return {
         fullHeight: '',
-        tableHeight:null,
+        tableHeight: null,
         loading: true, // 遮罩层
         ids: [], // 选中数组
         total: 0, // 总条数
@@ -43,32 +41,28 @@
         title: "", // 弹出层标题
         open: false, // 是否显示弹出层
         queryParams: { // 查询参数
-        pageNum: 1,
-        pageSize: 10,
-        sellerId: 0
+          pageNum: 1,
+          pageSize: 10,
+          sellerId: 0
         },
-
         form: {}, // 表单参数
-
         rules: {} // 表单校验
       };
     },
     created() {
       this.queryParams.sellerId = this.$store.state.user.sellerid
       this.getList();
-   this.$nextTick(()=>{
-          this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
-       })
-
-   },
-   watch:{
-     fullHeight(val,oldval){
-       console.log(val)
-       this.tableHeight = val - 130
-     }
-   },
+      this.$nextTick(() => {
+        this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
+      })
+    },
+    watch: {
+      fullHeight(val, oldval) {
+        console.log(val)
+        this.tableHeight = val - 130
+      }
+    },
     methods: {
-      //
       formatType(row) {
         var types = row.ChangeType
         var optDes = ''
@@ -81,8 +75,8 @@
       },
       //格式化时间
       formatTime(row) {
-        var Time = row.AddTime
-        var newtime = ""
+        let Time = row.AddTime;
+        let newtime = "";
         if (Time > 0) {
           newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
         }
@@ -90,18 +84,17 @@
       },
       //格式化价格
       formatMoney(row) {
-        var nm = 0
-        var money = row.ChangeMoney
+        var nm = 0;
+        var money = row.ChangeMoney;
         if (money > 0) {
           nm = money / 1000
         }
         return nm
-
       },
       /** 查询商户余额变动日志列表 */
       getList() {
         this.loading = true;
-        console.log("this.queryParams", this.queryParams)
+        //console.log("重点注意shopid", this.queryParams)
         listAsset(this.queryParams).then(response => {
           this.assetList = response.data.list;
           this.total = response.data.total;
@@ -117,18 +110,20 @@
   };
 </script>
 <style scoped>
-   .app-container{
-     height:100%;
-   }
+  .app-container {
+    height: 100%;
+  }
+
+  .box-card {
+    height: 100%;
+  }
+
+  .box-card /deep/ .el-card__body {
+    height: 100%;
+    overflow: hidden;
+  }
 
-   .box-card{
-     height:100% ;
-   }
-   .box-card /deep/ .el-card__body{
-     height:100%;
-     overflow: hidden;
-   }
-   .el-table{
-     height:calc(100% - 120px);
-   }
+  .el-table {
+    height: calc(100% - 120px);
+  }
 </style>

src/views/system/auth/menuList/index.vue

@@ -391,3 +391,10 @@ export default {
   }
 };
 </script>
+<style lang="scss" type="text/stylus" scoped>
+.app-container {
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+</style>

src/views/system/freight/freight_list/indexbtn.vue

@@ -23,8 +23,8 @@
       </el-form-item>
        <el-form-item label="计费方式">
          <el-radio-group v-model="goodsDate.ChargeType">
-          <el-radio :label="1">按数量</el-radio>
-          <el-radio :label="2">按个数</el-radio>
+          <el-radio :label="1">按重量</el-radio>
+          <el-radio :label="2">按数量</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="配送区域">

src/views/system/goods/add/components/goodsinfomation.vue

@@ -6,20 +6,35 @@
 
           <el-form-item label="商品名称" prop="goodsName">
             <el-input v-model="ruleForm.goodsName" style="width:400px;"></el-input>
+            <el-popover
+              placement="top-start" width="300" trigger="hover" content="最多允许输入30个汉字（60字符），建议标题内包含与商品相关的关键词">
+              <i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
+            </el-popover>
           </el-form-item>
           <el-form-item label="商品分类" prop="categoryId">
             <el-cascader v-model="ruleForm.categoryId" :props='propsaddress' :options="options" @change="handleChange" style="width:400px;"></el-cascader>
           </el-form-item>
+          <el-form-item label="市场原价" prop="scPrice">
+            <el-input v-model="ruleForm.scPrice" style="width:400px;"></el-input> 元
+            <el-popover
+              placement="top-start" width="300" trigger="hover" content="市场原价起到参考的作用">
+              <i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
+            </el-popover>
+          </el-form-item>
           <el-form-item label="指导售价" prop="price">
             <el-input v-model="ruleForm.price" style="width:400px;"></el-input> 元
+            <el-popover
+              placement="top-start" width="300" trigger="hover" content="您建议下游商家售卖的价格">
+              <i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
+            </el-popover>
           </el-form-item>
           <el-form-item label="结算价格" prop="jsPrice">
-            <el-input v-model="ruleForm.jsPrice" style="width:400px;"></el-input>
+            <el-input v-model="ruleForm.jsPrice" style="width:400px;"></el-input> 元
+            <el-popover
+              placement="top-start" width="300" trigger="hover" content="您与云仓平台最终结算的价格">
+              <i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
+            </el-popover>
           </el-form-item>
-          <el-form-item label="市场原价" prop="scPrice">
-            <el-input v-model="ruleForm.scPrice" style="width:400px;"></el-input> 元
-          </el-form-item>
-
           <el-form-item label="运费模板" prop="freightId">
             <el-radio-group v-model="ruleForm.resource" >
               <el-radio label="0">单独运费</el-radio>
@@ -97,7 +112,7 @@
         <quill-editor ref="myTextEditor" v-model="content" :options="editorOption" style="height:500px;"></quill-editor>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleinfomationclick('ruleForm')">下一步</el-button>
+<!--        <el-button type="primary" @click="handleinfomationclick('ruleForm')">下一步</el-button>-->
         <el-button @click="resetForm('ruleForm')">重置</el-button>
       </el-form-item>
     </el-form>
@@ -120,26 +135,12 @@
     },
     data() {
       return {
-        tags: [{
-            id: 2,
-            tag: "假一赔十"
-          },
-          {
-            id: 3,
-            tag: "7天退换"
-          },
-          {
-            id: 4,
-            tag: "不可退还"
-          },
-          {
-            id: 5,
-            tag: "厂家直供"
-          },
-          {
-            id: 6,
-            tag: "售后无忧"
-          },
+        tags: [
+          {id: 2, tag: "假一赔十"},
+          {id: 3, tag: "7天退换"},
+          {id: 4, tag: "不可退还"},
+          {id: 5, tag: "厂家直供"},
+          {id: 6, tag: "售后无忧"}
         ],
         propsaddress: {
           label: 'label',
@@ -205,7 +206,7 @@
           }],
           scPrice: [{
             required: true,
-            message: '请填写市场原件',
+            message: '请填写市场原价',
             trigger: 'blur'
           }],
           // resource: [{

src/views/system/goods/add/components/goodsparameter.vue

@@ -25,7 +25,7 @@
         </el-col>
     </el-row>
 
-    <el-button type="primary" @click="handleinfomationclick('ruleForm')">下一步</el-button>
+<!--    <el-button type="primary" @click="handleinfomationclick('ruleForm')">下一步</el-button>-->
     <el-button >重置</el-button>
   </div>
 </template>

src/views/system/goods/add/components/guide.vue

@@ -241,7 +241,7 @@
           </el-table-column>
         </el-table>
 
-        <el-button type="primary" @click="handleinfomationclick('ruleForm')">下一步</el-button>
+<!--        <el-button type="primary" @click="handleinfomationclick('ruleForm')">下一步</el-button>-->
     <el-button >重置</el-button>
       </div>
     </div>

src/views/system/goods/add/index.vue

@@ -9,7 +9,7 @@
   <el-tab-pane label="商品信息">
         <Goodsinfomation  :infomationdatas='infomationdata' @infomationclick='infomationclick' />
   </el-tab-pane>
-  <el-tab-pane label="商品图片"   >
+  <el-tab-pane label="商品图片">
         <Goodsimg :imgdata='imgdate' @imgclicks='imgclick' />
   </el-tab-pane>
   <el-tab-pane label="商品规格">
@@ -171,11 +171,6 @@ export default {
       });
 
     },
-
-
-
-
-
   }
 }
 </script>
@@ -210,7 +205,8 @@ ul,li{
 }
 .box-card /deep/ .el-card__body{
   height:100%;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 .el-tabs{
   height:calc(100% - 35px);

src/views/system/goods/onsale/index.vue

@@ -93,7 +93,7 @@
         />
            <!-- 添加或修改goods对话框 -->
            <el-dialog :title="title" :visible.sync="open" :modal-append-to-body	="false" width="90%" style="height:90%;overflow:hidden;" append-to-body>
-              <IndexBtn  :option="form" />
+              <IndexBtn :option="form" />
            </el-dialog>
     </el-card>
       </div>
@@ -272,6 +272,14 @@ export default {
      height:100%;
    }
 
+   /deep/ .el-dialog {
+     height: 100%;
+   }
+   /deep/.el-dialog__body {
+     height: 80%;
+     overflow-y: scroll ;
+   }
+
    .box-card{
      height:100% ;
    }