snow 1 éve
szülő
commit
893dab5e73

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/app.js


+ 1 - 1
dist/runtime.js

@@ -113,7 +113,7 @@
 /******/
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "d1ff4fdc86893cd94cdb";
+/******/ 	var hotCurrentHash = "b7bdfde274062e585088";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;
 /******/ 	var hotCurrentChildModule;

+ 41 - 14
src/components/binding/index.vue

@@ -1,18 +1,26 @@
 <template>
 <template>
   <div class="binding-container">
   <div class="binding-container">
-    <div>
-      <el-alert title="您的微信号未绑定过系统,请先绑定一个账号" :closable="false" type="warning" center show-icon />
-      <el-form label-width="80px" size="mini" style="margin-top:10px" ref="formRef" :model="formData" :rules="rules">
-        <el-form-item label="账号:" prop="username">
-          <el-input v-model="formData.username" placeholder="账号" />
+    <div class="login-container">
+      <h3>请登录采销365账号 与当前微信绑定</h3>
+      <el-form label-width="0px" style="margin-top:10px" ref="formRef" :model="formData" :rules="rules">
+        <el-form-item label="" prop="username">
+          <el-input v-model="formData.username" placeholder="账号">
+            <template slot="prefix">
+              <i class="el-icon-user" style="padding-left:5px;color:#087af5"></i>
+            </template>
+          </el-input>
         </el-form-item>
         </el-form-item>
 
 
-        <el-form-item label="密码:" prop="password">
-          <el-input type="password" v-model="formData.password" placeholder="密码" />
+        <el-form-item prop="password">
+          <el-input type="password" v-model="formData.password" placeholder="密码">
+            <template slot="prefix">
+              <i class="el-icon-key"  style="padding-left:5px;color:#087af5"></i>
+            </template>
+          </el-input>
         </el-form-item>
         </el-form-item>
 
 
-        <el-form-item style="display: flex;justify-content: flex-end;">
-          <el-button type="primary" @click="submit">登录</el-button>
+        <el-form-item>
+          <el-button type="primary" @click="submit" style="width:100%;border-radius:15px;background-color:#087af5"">登 录</el-button>
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
     </div>
     </div>
@@ -139,13 +147,32 @@ export default {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .binding-container {
 .binding-container {
-  display: flex;
-  flex-direction: column;
   align-items: center;
   align-items: center;
+  position: fixed;
+  top: 0%;
+  width:100vw;
+  height: 100vh;
+  background: url("~@/assets/bg-phone.jpg") no-repeat;
+  background-size:cover;
 
 
-  /deep/.el-form {
-    width: 95%;
-    max-width: 500px;
+  .login-container{
+
+    h3{
+      text-align: center;
+      color:#087af5;
+    }
+
+    width:90%;
+    max-width: 428px;
+    background:#fff;
+    box-sizing: border-box;
+    padding: 10px 40px;
+    position: absolute;
+
+    top:50%;
+    left:50%;
+    transform:translate(-50%,-50%);
+    border-radius:10px;
   }
   }
 }
 }
 </style>
 </style>

+ 1 - 1
src/config/env.development.js

@@ -1,7 +1,7 @@
 // 本地
 // 本地
 
 
 module.exports = {
 module.exports = {
-  title: "业绩报表",
+  title: "微信登录",
   baseApi: "http://user.test241.wanyuhengtong.com/",
   baseApi: "http://user.test241.wanyuhengtong.com/",
   baseReportApi: "http://report.test241.wanyuhengtong.com/",
   baseReportApi: "http://report.test241.wanyuhengtong.com/",
   cxApi: "http://stock.api.wanyuhengtong.com/",
   cxApi: "http://stock.api.wanyuhengtong.com/",

+ 5 - 4
src/config/env.prod.js

@@ -1,13 +1,14 @@
 // 本地
 // 本地
 
 
 module.exports = {
 module.exports = {
-  title: "业绩报表",
-  baseApi: "http://inv.sitw.wanyuhengtong.com/",
+  title: "微信登录",
+  baseApi: "http://user.test241.wanyuhengtong.com/",
+  baseReportApi: "http://report.test241.wanyuhengtong.com/",
   cxApi: "http://stock.api.wanyuhengtong.com/",
   cxApi: "http://stock.api.wanyuhengtong.com/",
   fileURL: `https://api2.edu.futurelab.tv`,
   fileURL: `https://api2.edu.futurelab.tv`,
   reportApi: "http://cxinv.api.caixiao365.com/",
   reportApi: "http://cxinv.api.caixiao365.com/",
-  appId: "wxfa1f1a0211edf630",
-  redirect:'http://cxinv.api.caixiao365.com/',
+  appId: "wx975a4b5b19681d8b",
+  redirect: 'http://depart.test241.wanyuhengtong.com/',
   authUrl: 'http://rep.caixiao365.com',
   authUrl: 'http://rep.caixiao365.com',
   wechatEnv: 'micromessenger',
   wechatEnv: 'micromessenger',
   ding: {
   ding: {

+ 5 - 35
src/pages/wechat.vue

@@ -32,50 +32,20 @@ export default {
       loading: false,
       loading: false,
       isBound: false,
       isBound: false,
       isReady:false,
       isReady:false,
-      back:"",
-      name:"",
-      openid: "",
-      isError: "",
       message: "",
       message: "",
-      template:""
+      template:"",
+      isError: "",
+      openid: "",
+      back:"",
+      name:""
     }
     }
   },
   },
   async mounted() {
   async mounted() {
     this.back = getParameterByName("back")
     this.back = getParameterByName("back")
     this.name = getParameterByName("name")
     this.name = getParameterByName("name")
     await this.requestUserinfo()
     await this.requestUserinfo()
-    // await this.initialTemplate()
-    // this.initialWechatConfig()
   },
   },
   methods: {
   methods: {
-    // async initialTemplate(){
-    //   this.loading = true
-    //   const result = await asyncRequest.template();
-    //   this.loading = false;
-    //   this.template = result.data.map(({priTmplId}) => priTmplId).join(",")
-
-    //   console.log(this.template,'-----')
-    // },
-    // async initialWechatConfig(){
-    //   const url = window.location.href.split("#")[0]
-    //   const result = await asyncRequest.config({ url })
-    //   const { appid, noncestr, signature, timestamp } = result.data;
-
-    //   wx.config({
-    //     appId:appid,
-    //     timestamp,
-    //     nonceStr: noncestr,
-    //     signature,
-    //     jsApiList:['chooseImage'],
-    //     openTagList:['wx-open-subscribe']
-    //   })
-
-    //   wx.ready(() => {
-    //     this.isReady = true;
-    //   })
-
-    //   wx.error(function(err){ console.log(err,'---') })
-    // },
     async requestUserinfo() {
     async requestUserinfo() {
       const code = getParameterByName("code")
       const code = getParameterByName("code")
       this.loading = true
       this.loading = true

+ 2 - 2
src/router/index.js

@@ -4,8 +4,8 @@ import Nav from "./../pages/nav.vue"
 
 
 const routes = [
 const routes = [
   { path: '/wechat', component: Wechat },
   { path: '/wechat', component: Wechat },
-  { path: '/login', component: Login },
-  { path: '/', component: Nav }
+  { path: '/', component: Login },
+  // { path: '/', component: Nav }
 ]
 ]
 
 
 const router = new VueRouter({routes ,mode:'hash'})
 const router = new VueRouter({routes ,mode:'hash'})

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott