ytj

config/index.js

@@ -24,12 +24,12 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', //wf
-        target: 'http://dev.ycjcjy.com', //zys
+        target: 'http://192.168.0.62:8080', //wf
+        // target: 'http://dev.ycjcjy.com', //zys
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
-        pathRewrite: {
-          '^/api': '/api-v2/api'
-        },
+        // pathRewrite: {
+        //   '^/api': '/api-v2/api'
+        // },
       },
     },
     // CSS Sourcemaps off by default because relative paths are "buggy"

src/module/user/bindMobile/bindMobile.vue

@@ -98,8 +98,10 @@ export default {
     onConfirmC (value, index) {
       this.caseName = value.CaseName
       this.postData.case = value.CaseId
-      for (let i=0;i<this.caseInfo.sales.length;i++){
-        if (this.caseInfo.sales[i].CaseId === this.postData.case){
+      this.columnsS = []
+      this.salesName = '选择销售'
+      for (let i = 0; i < this.caseInfo.sales.length; i++) {
+        if (this.caseInfo.sales[i].CaseId === this.postData.case) {
           this.columnsS.push(this.caseInfo.sales[i])
         }
       }
@@ -123,7 +125,7 @@ export default {
       if (!this.postData.case) {
         this.$toast('请先选择案场')
         return
-      } else if (!this.columnsS) {
+      } else if (this.columnsS.length <= 0) {
         this.$toast('此案场无销售')
         return
       }

src/module/user/bindMobile/page.scss

@@ -48,12 +48,12 @@
           height: 100%;
         }
         .sand{
-          width: .7rem;
+          padding: 0 .1rem;
           height: .24rem;
           border-radius:20px;
           border:1px solid rgba(218,218,218,1);
           color: rgba(218,218,218,1);
-          font-size: 12px;
+          font-size: .12rem;
           text-align: center;
           line-height: .24rem;
           position: absolute;
@@ -78,11 +78,19 @@
         div{
           height: 100%;
           display: flex;
+          flex: 1;
+          margin-left: .1rem;
           align-items: center;
           border-radius:8px;
           border:1px solid rgba(168,182,200,0.2);
           padding: .1rem;
           box-sizing: border-box;
+          span{
+            width: 70%;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
+          }
         }
       }
       .submit{

src/module/user/mainPage/indexPage/index.vue

@@ -78,45 +78,45 @@ export default {
   data () {
     return {
       swiperOption: {
-          observer:true,
-          loop : true,
-          autoplay: {
-            disableOnInteraction: false,
-          }
+        observer: true,
+        loop: true,
+        autoplay: {
+          disableOnInteraction: false,
+        }
       },
       swiperOptionMsg: {
-          observer:true,
-          direction : 'vertical',
-          loop : true,
-          autoplay: {
-            disableOnInteraction: false,
-          }
+        observer: true,
+        direction: 'vertical',
+        loop: true,
+        autoplay: {
+          disableOnInteraction: false,
+        }
       },
       newsList: [{ // 资讯列表
-        title:'我是标题我是标题我是标题我是标题我是标题我是标题',
-        time:'2018年5月25日',
-        img:'',
-        id:''
-      },{
-        title:'我是标题我是标题我是标题我是标题我是标题我是标题',
-        time:'2018年5月25日',
-        img:'',
-        id:''
-      },{
-        title:'我是标题我是标题我是标题我是标题我是标题我是标题',
-        time:'2018年5月25日',
-        img:'',
-        id:''
-      },{
-        title:'我是标题我是标题我是标题我是标题我是标题我是标题',
-        time:'2018年5月25日',
-        img:'',
-        id:''
-      },{
-        title:'我是标题我是标题我是标题我是标题我是标题我是标题',
-        time:'2018年5月25日',
-        img:'',
-        id:''
+        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
+        time: '2018年5月25日',
+        img: '',
+        id: ''
+      }, {
+        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
+        time: '2018年5月25日',
+        img: '',
+        id: ''
+      }, {
+        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
+        time: '2018年5月25日',
+        img: '',
+        id: ''
+      }, {
+        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
+        time: '2018年5月25日',
+        img: '',
+        id: ''
+      }, {
+        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
+        time: '2018年5月25日',
+        img: '',
+        id: ''
       }]
     }
   },
@@ -124,10 +124,10 @@ export default {
     ...mapState({
       banner: x => x.index.banner
     }),
-    MySwiper() {
+    MySwiper () {
       return this.$refs.mySwiper.swiper
     },
-    MySwiperMsg() {
+    MySwiperMsg () {
       return this.$refs.MySwiperMsg.swiper
     }
   },
@@ -137,7 +137,7 @@ export default {
     swiperSlide,
   },
   created () {
-    this.getIndexInfo(123)
+    this.getIndexInfo({ orgId: '1' })
   },
   methods: {
     ...mapIndexActions(['getIndexInfo'])

src/store/app/app.js

@@ -2,11 +2,11 @@
 export default {
   namespaced: true,
   state: {
-    location: []
+    orgId: '1'
   },
   mutations: {
     init (state, data) { // 这里的state对应着上面这个state
-      state.location = data
+      state.orgId = '2'
     }
   },
   actions: {

src/store/index/index.js

@@ -3,11 +3,15 @@ import api from '../../util/api'
 const http = new Object
 
 // 请求数据
-http.getBanner = (data) => {
+http.getIndexLocation = (data) => {
   console.log(data)
   return new Promise((resolve, reject) => {
-    Ajax(api.user.case.url, {
-      method: api.user.case.method
+    Ajax(api.index.location.url, {
+      method: api.index.location.method,
+      queryData: {
+        issys: 0,
+        orgid: data
+      }
     }).then(res => {
       resolve(res)
     }).catch((err) => {
@@ -16,11 +20,10 @@ http.getBanner = (data) => {
   })
 }
 
-http.getFiveA = (data) => {
-  console.log(data)
+http.getBanner = (data) => {
   return new Promise((resolve, reject) => {
-    Ajax(api.index.fiveA.url, {
-      method: api.index.fiveA.method
+    Ajax(api.index.banner.url, {
+      method: api.index.banner.method
     }).then(res => {
       resolve(res)
     }).catch((err) => {
@@ -30,7 +33,6 @@ http.getFiveA = (data) => {
 }
 
 http.getMessage = (data) => {
-  console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.message.url, {
       method: api.index.message.method
@@ -78,7 +80,7 @@ export default {
     cms: []
   },
   mutations: {
-    setBannet (state, data) { // 获取首页轮播图
+    setBanner (state, data) { // 获取首页轮播图
       state.banner = data
     },
     setFiveA (state, data) { // 获取5A
@@ -92,15 +94,17 @@ export default {
     },
     setCms (state, data) { // 获取cms
       state.cms = data
-    },
+    }
   },
   actions: {
     async getIndexInfo (context, param) { // 首页全部请求
       try {
+        let location = await http.getIndexLocation(param.orgId)
+        context.commit('setFiveA', location)
         let banner = await http.getBanner(param)
         context.commit('setBanner', banner)
-        let fiveA = await http.getFiveA(param)
-        context.commit('setFiveA', fiveA)
+        // let fiveA = await http.getFiveA(param)
+        // context.commit('setFiveA', fiveA)
         let message = await http.getBanner(param)
         context.commit('setMessage', message)
         let porject = await http.getBanner(param)

src/store/userCenter/userCenter.js

@@ -3,7 +3,7 @@ import api from '../../util/api'
 const http = new Object
 
 // 请求数据
-http.getUserInfo = (data) => {
+http.getUserInfo = (data) => { // 获取用户信息
   return new Promise((resolve, reject) => {
     Ajax(api.user.info.url, {
       method: api.user.info.method
@@ -15,7 +15,7 @@ http.getUserInfo = (data) => {
   })
 }
 
-http.getCaseInfo = (data) => {
+http.getCaseInfo = (data) => { // 获取案场列表
   return new Promise((resolve, reject) => {
     Ajax(api.user.case.url, {
       method: api.user.case.method,
@@ -30,7 +30,7 @@ http.getCaseInfo = (data) => {
   })
 }
 
-http.getCaptcha = (data) => {
+http.getCaptcha = (data) => { // 获取验证码
   console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.user.captcha.url, {
@@ -46,7 +46,7 @@ http.getCaptcha = (data) => {
   })
 }
 
-http.submitData = (data) => {
+http.submitData = (data) => { // 绑定手机号
   console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.user.wxsignup.url, {

src/util/api.js

@@ -1,28 +1,33 @@
 const baseUrl = '/api'
 const wechat = '/wechat'
 const guest = '/guest'
+const common = '/common'
 
 const $api = {
-  index: { // 测试
-    banner: {
-      method: 'post',
-      url: `${baseUrl}${wechat}/wxsignin`
+  index: { // 首页
+    location: { // 获取轮播图
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/location`
     },
-    fiveA: {
-      method: 'post',
-      url: `${baseUrl}${wechat}/wxsignin`
+    banner: { // 获取轮播图
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/img`
     },
-    message: {
-      method: 'post',
-      url: `${baseUrl}${wechat}/wxsignin`
+    fiveA: { // 获取5A
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/location`
     },
-    project: {
-      method: 'post',
-      url: `${baseUrl}${wechat}/wxsignin`
+    message: { // 获取最新消息
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/info`
     },
-    cms: {
-      method: 'post',
-      url: `${baseUrl}${wechat}/wxsignin`
+    project: { // 获取项目专题
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/case`
+    },
+    cms: { // 获取cms消息
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/news`
     }
   },
   fiveA: {
@@ -44,19 +49,19 @@ const $api = {
     }
   },
   user: {
-    info: {
-      method: 'post',
+    info: { // 获取用户信息
+      method: 'get',
       url: `${baseUrl}${wechat}/wxsignin`
     },
-    case: {
+    case: { // 获取案场及销售列表
       method: 'get',
       url: `${baseUrl}${guest}/case`
     },
-    wxsignup: {
+    wxsignup: { // 绑定手机号
       method: 'post',
       url: `${baseUrl}${guest}/wxsignup`
     },
-    captcha: {
+    captcha: { // 获取手机验证码
       method: 'get',
       url: `${baseUrl}${guest}/captcha`
     }