Merge branch 'master' of http://git.ycjcjy.com/xuchengxiang/niucai-admin into master

config/index.js

@@ -12,8 +12,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target: 'http://127.0.0.1:8080',
-        // target: 'https://app.xnsport.cn',
+        // target: 'http://127.0.0.1:8080',
+        target: 'https://api.xnsport.cn',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         pathRewrite: { '^/api': '/api' }
       }

src/pages/PaiJiang/PaiJiangGuanLi/index.vue

@@ -70,10 +70,12 @@
 </template>
 
 <script>
-import MainPageContainer from '../../../components/common/MainPageContainer'
 import 'swiper/dist/css/swiper.css'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import { createNamespacedHelpers } from 'vuex'
+import MainPageContainer from '../../../components/common/MainPageContainer'
+import { APIBase } from '@/util/constant'
+
 const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'index',
@@ -143,7 +145,7 @@ export default {
           CurrentOrder = { ...item }
         }
       })
-      window.location.href = `/api/shop/sent-award/order/${CurrentOrder.orderId}?returlURL=${encodeURIComponent(`${window.location.origin}/#/PaiJiang/PaiJiangGuanLi`)}&token=${window.localStorage.Jwt}`
+      window.location.href = `${APIBase}api/shop/sent-award/order/${CurrentOrder.orderId}?returlURL=${encodeURIComponent(`${window.location.origin}/#/PaiJiang/PaiJiangGuanLi`)}&token=${window.localStorage.Jwt}`
       // this.SendPrize({ urlData: { id: OrderId.join(',') } }).then(() => {
       //   this.Toast('派奖成功')
       //   this.PageList.splice(Index, 1)

src/pages/SignUp/index.vue

@@ -174,7 +174,7 @@ export default {
     ToShopSignUp () {
       if (!this.CheckFormData() || this.DataLock) return
       this.DataLock = true
-      this.ShopSignUp({ data: { ...this.FormData } }).then((res) => {
+      this.ShopSignUp({ data: { ...this.FormData, password: md5(this.FormData.password) } }).then((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
         this.SignIn({ data: { password: md5(this.FormData.password), userName: this.FormData.phone } }).then(() => { // 登录

src/pages/WoDe/GeRenSheZhi/index.vue

@@ -3,17 +3,19 @@
     <MainPageContainer :ShowMainHeader="true" :MainHeaderTitle="`个人设置`" :ShowMainHeaderBack="true">
       <ul>
         <li class="flex-h">
-          <span class="flex-item">关于我们</span>
+          <router-link tag="span" class="flex-item" :to="{ name: 'GuanYuWoMen' }">关于我们</router-link>
           <i class="iconfont iconjiantouright"></i>
         </li>
       </ul>
-      <a>退出登录</a>
+      <a @click="SignOut">退出登录</a>
     </MainPageContainer>
   </div>
 </template>
 
 <script>
 import MainPageContainer from '../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'index',
   data () {
@@ -32,10 +34,19 @@ export default {
     })
   },
   methods: {
+    ...mapUserMutations([
+      'EmptyUserInfo'
+    ]),
     Refresh (done) { // 页面下拉刷新
       window.setTimeout(() => {
         done()
       }, 1000)
+    },
+    SignOut () { // 登出
+      this.EmptyUserInfo()
+      window.localStorage.removeItem('niucaiadminname')
+      window.localStorage.removeItem('niucaiadminpassword')
+      this.$router.push({ name: 'SignIn' })
     }
   }
 }

src/pages/WoDe/GuanYuWoMen/index.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="Page">
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="关于我们">
+      <div class="PageContainer">
+        <div class="Content">
+          <span>牛彩成功的关键是赢得良好的口碑，诚信服务、热心解答、精心提供资料、延伸服务。</span>
+          <span>业主的综合素质水平直接决定了投注站的服务质量。牛彩致力于与业主一起共同成长，并提供专业服务，不断提高业务水平，始终秉承诚信经营，创新服务新内涵，为广大站点彩民提供更优质、贴心、便捷的个性化服务。</span>
+          <div class="Box"></div>
+        </div>
+        <div class="Logo">
+          <div class="Img">
+            <img src="../../../assets/img/logo.png" class="centerLabel contain" alt="">
+          </div>
+          <span>牛彩</span>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import MainPageContainer from '../../../components/common/MainPageContainer'
+export default {
+  name: '',
+  data () {
+    return {
+    }
+  },
+  computed: {
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/GuanYuWoMen/page.scss

@@ -0,0 +1,51 @@
+.Page {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+    > .Content {
+      min-height: 100%;
+      padding: 0 0.15rem;
+      position: relative;
+      overflow: hidden;
+      > span {
+        display: block;
+        font-size: 0.14rem;
+        color: #adadad;
+        line-height: 0.2rem;
+        text-align: justify;
+        text-indent: 2em;
+        &:first-child {
+          margin-top: 0.2rem;
+        }
+      }
+      > .Box {
+        width: 100%;
+        height: 1rem;
+      }
+    }
+    > .Logo {
+      text-align: center;
+      margin-top: -1rem;
+      > .Img {
+        width: 0.44rem;
+        height: 0.44rem;
+        position: relative;
+        overflow: hidden;
+        margin: 0 auto;
+      }
+      > span {
+        font-size: 0.17rem;
+        display: inline-block;
+        margin-top: 0.1rem;
+        line-height: 0.3rem;
+      }
+    }
+  }
+}

src/pages/WoDe/ShiMingRenZheng/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="Page">
+    <MainPageContainer @ShopInfoChange="Init" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="支付宝实名认证">
+      <div class="PageContainer">
+        <div class="Form">
+          <div class="flex-h">
+            <span>支付宝账号</span>
+            <div class="flex-item">
+              <input type="text" placeholder="请输入您的支付宝账号" v-model="AliAccount">
+            </div>
+          </div>
+          <div class="flex-h">
+            <span>真实姓名</span>
+            <div class="flex-item">
+              <input type="text" placeholder="请输入您的真实姓名" v-model="RealName">
+            </div>
+          </div>
+        </div>
+        <span class="Tips">请务必确保账号与认证姓名正确</span>
+        <div class="Btn">
+          <a @click="ToAliShiMingRenZheng">确定</a>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import MainPageContainer from '../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('user')
+export default {
+  name: '',
+  data () {
+    return {
+      RealName: '',
+      AliAccount: '',
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      CurrentShopInfo: x => x.CurrentShopInfo
+    })
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserActions([
+      'AliShiMingRenZheng'
+    ]),
+    Init () {
+      if (this.CurrentShopInfo !== null) {
+        this.AliAccount = this.CurrentShopInfo.aliLoginId
+        this.RealName = this.CurrentShopInfo.name
+      }
+    },
+    ToAliShiMingRenZheng () {
+      if (this.DataLock) return
+      this.DataLock = true
+      this.AliShiMingRenZheng({
+        urlData: { id: this.CurrentShopInfo.shopId },
+        data: {
+          name: this.RealName,
+          aliLoginId: this.AliAccount
+        }
+      }).then(() => {
+        this.Toast('认证成功')
+        this.DataLock = false
+      }).catch((res) => {
+        this.Toast(res.data.message)
+        this.DataLock = false
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/ShiMingRenZheng/page.scss

@@ -0,0 +1,57 @@
+.Page {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    background: #f2f2f2;
+    > .Form {
+      background: #fff;
+      > div {
+        align-items: center;
+        padding: 0 0.15rem;
+        border-bottom: 0.01rem solid #f8f8f8;
+        > span {
+          font-size: 0.14rem;
+          min-width: 1rem;
+          margin-right: 0.1rem;
+        }
+        > div {
+          > input {
+            width: 100%;
+            display: block;
+            font-size: 0.14rem;
+            line-height: 0.2rem;
+            padding: 0.1rem 0;
+            text-align: right;
+            background: none;
+          }
+        }
+      }
+    }
+    > .Tips {
+      display: block;
+      padding: 0 0.15rem;
+      font-size: 0.12rem;
+      color: #999;
+      line-height: 0.2rem;
+      margin-top: 0.1rem;
+    }
+    > .Btn {
+      padding: 0 0.15rem;
+      margin-top: 0.2rem;
+      > a {
+        display: block;
+        font-size: 0.14rem;
+        line-height: 0.4rem;
+        background: #d91d36;
+        text-align: center;
+        border-radius: 0.06rem;
+        color: #fff;
+      }
+    }
+  }
+}

src/pages/WoDe/ShouYe/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Page">
-    <MainPageContainer :MainTabBarActiveId="4" :ShowMainTabBar="true">
+    <MainPageContainer @ShopInfoChange="Init" :MainTabBarActiveId="4" :ShowMainTabBar="true">
       <div class="Container">
         <!-- 顶部 -->
         <div class="Top">
@@ -10,7 +10,7 @@
           </div>
           <div class="Info flex-h">
             <div class="Icon">
-              <img src="" class="centerLabel cover" alt="">
+              <img src="https://niucai.oss-cn-beijing.aliyuncs.com/app/images/default-avatar.png" class="centerLabel cover" alt="">
             </div>
             <div class="flex-item flex-v">
               <div class="flex-item flex-h">
@@ -20,7 +20,7 @@
                   </div>
                 </div>
                 <span>营业额</span>
-                <em>6.20</em>
+                <em v-if="CurrentShopInfo !== null">{{CurrentShopInfo.account.amount}}</em>
                 <i class="iconfont iconjiantouright"></i>
               </div>
               <div class="Desc" v-if="CurrentShopInfo !== null">
@@ -38,6 +38,7 @@
               <img :src="item.Icon" class="centerLabel contain" alt="">
             </div>
             <span class="flex-item">{{item.Name}}</span>
+            <span style="color: #999; font-size: 0.12rem;">{{item.Tips}}</span>
             <i class="iconfont iconjiantouright"></i>
           </router-link>
         </ul>
@@ -57,10 +58,10 @@ export default {
       UserTab: [
         // { Name: '出票管理', Icon: '', Router: '' },
         // { Name: '派奖管理', Icon: '', Router: 'PaiJiangGuanLi' },
-        { Name: '购彩订单', Icon: require('../../../assets/img/goucaidingdan.png'), Router: 'DingDanLiuShui' },
-        { Name: '收款管理', Icon: require('../../../assets/img/shoukuanguanli.png'), Router: 'ZhiFuBaoRenZheng' },
-        { Name: '彩种设置', Icon: require('../../../assets/img/caizhongshezhi.png'), Router: 'CaiZhongSheZhi' },
-        { Name: '邀请码', Icon: require('../../../assets/img/yaoqingma.png'), Router: 'XiaZaiErWeiMa' }
+        { Name: '购彩订单', Icon: require('../../../assets/img/goucaidingdan.png'), Router: 'DingDanLiuShui', Tips: null, Id: 1 },
+        { Name: '收款管理', Icon: require('../../../assets/img/shoukuanguanli.png'), Router: 'ZhiFuBaoRenZheng', Tips: null, Id: 2 },
+        { Name: '彩种设置', Icon: require('../../../assets/img/caizhongshezhi.png'), Router: 'CaiZhongSheZhi', Tips: null, Id: 3 },
+        { Name: '邀请码', Icon: require('../../../assets/img/yaoqingma.png'), Router: 'XiaZaiErWeiMa', Tips: null, Id: 4 }
       ]
     }
   },
@@ -80,6 +81,15 @@ export default {
     })
   },
   methods: {
+    Init () {
+      if (this.CurrentShopInfo !== null) {
+        this.UserTab.map((item) => {
+          if (item.Id - 0 === 2) {
+            item.Tips = this.CurrentShopInfo.aliLoginId || '未授权'
+          }
+        })
+      }
+    },
     Refresh (done) { // 页面下拉刷新
       window.setTimeout(() => {
         done()

src/pages/WoDe/ShouYe/page.scss

@@ -56,6 +56,7 @@
           border: 0.01rem solid #fff;
           margin-right: 0.1rem;
           margin-left: 0.15rem;
+          background: #ccc;
         }
         > .flex-item {
           > .flex-h {

src/pages/WoDe/ZhiFuBaoRenZheng/index.vue

@@ -107,13 +107,14 @@
               </div>
               <i class="iconfont iconjiantouright"></i>
             </div>
-            <router-link tag="div" :to="{ name: 'ZhiFuBaoRenZheng' }" class="Line flex-h">
+            <router-link tag="div" :to="{ name: 'ShiMingRenZheng' }" class="Line flex-h">
               <span>收款管理</span>
               <div class="flex-item"></div>
+              <span>{{CurrentShopInfo.aliLoginId || '未授权'}}</span>
               <i class="iconfont iconjiantouright"></i>
             </router-link>
             <div class="Btn">
-              <a @click="ShowQrCodeLayer = true">授权</a>
+              <a @click="ToShowQrCodeLayer">保存</a>
             </div>
           </div>
 
@@ -216,6 +217,11 @@ export default {
       'ShopValid',
       'GetCurrentShopInfo'
     ]),
+    ToShowQrCodeLayer () {
+      if (this.CurrentShopInfo !== null && this.CurrentShopInfo.shopId === 0) {
+        this.ShowQrCodeLayer = true
+      }
+    },
     ShopInfoChange () {
       this.ShopName = this.CurrentShopInfo.name
       this.ZZImg = this.CurrentShopInfo.businessLicense

src/pages/index/DingDanXiangQing/index.vue

@@ -53,7 +53,7 @@
 
         <div class="Bottom">
           <a @click="ToProcessOrder" v-if="!DetailInfo.bettingDetail.betting.isDrawn" class="active">确定</a>
-          <a :href="`/api/shop/sent-award/order/${$route.query.id}?returlURL=${encodeURIComponent(`${Origin}/#/PaiJiang/PaiJiangGuanLi`)}&token=${Jwt}`" v-if="DetailInfo.bettingDetail.betting.isDrawn && DetailInfo.bettingDetail.betting.isWinning && !DetailInfo.bettingDetail.betting.isCashed" class="active">派奖</a>
+          <a :href="`${APIBase}api/shop/sent-award/order/${$route.query.id}?returlURL=${encodeURIComponent(`${Origin}/#/PaiJiang/PaiJiangGuanLi`)}&token=${Jwt}`" v-if="DetailInfo.bettingDetail.betting.isDrawn && DetailInfo.bettingDetail.betting.isWinning && !DetailInfo.bettingDetail.betting.isCashed" class="active">派奖</a>
           <!-- <a v-else>撤单</a> -->
         </div>
       </div>
@@ -62,6 +62,7 @@
 </template>
 
 <script>
+import { createNamespacedHelpers } from 'vuex'
 import MainPageContainer from '../../../components/common/MainPageContainer'
 import DingDanXiangQingDaLeTou from '../../../components/index/DingDanXiangQingDaLeTou'
 import DingDanXiangQingShuangSeQiu from '../../../components/index/DingDanXiangQingShuangSeQiu'
@@ -69,7 +70,8 @@ import DingDanXiangQingZuQiu from '../../../components/index/DingDanXiangQingZuQ
 import DingDanXiangQingLanQiu from '../../../components/index/DingDanXiangQingLanQiu'
 import DingDanXiangQingP3 from '../../../components/index/DingDanXiangQingP3'
 import DingDanXiangQingP5 from '../../../components/index/DingDanXiangQingP5'
-import { createNamespacedHelpers } from 'vuex'
+import { APIBase } from '@/util/constant'
+
 const { mapActions: mapUserActions } = createNamespacedHelpers('user')
 export default {
   name: 'index',
@@ -79,6 +81,7 @@ export default {
       Origin: window.location.origin,
       CpImgArr: [],
       DetailInfo: null,
+      APIBase,
       DataLock: false // 数据锁
     }
   },

src/router/index.js

@@ -88,10 +88,20 @@ let router = new Router({
             name: 'GeRenSheZhi',
             component: resolve => (require(['@/pages/WoDe/GeRenSheZhi'], resolve))
           },
+          {
+            path: '/WoDe/GuanYuWoMen', // 个人中心-关于我们
+            name: 'GuanYuWoMen',
+            component: resolve => (require(['@/pages/WoDe/GuanYuWoMen'], resolve))
+          },
           {
             path: '/WoDe/XiaZaiErWeiMa', // 个人中心-下载二维码
             name: 'XiaZaiErWeiMa',
             component: resolve => (require(['@/pages/WoDe/XiaZaiErWeiMa'], resolve))
+          },
+          {
+            path: '/WoDe/ShiMingRenZheng', // 个人中心-实名认证
+            name: 'ShiMingRenZheng',
+            component: resolve => (require(['@/pages/WoDe/ShiMingRenZheng'], resolve))
           }
         ]
       },

src/store/user/index.js

@@ -79,6 +79,11 @@ export default {
     }
   },
   actions: {
+    AliShiMingRenZheng (context, payload) { // 支付宝实名认证
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.AliShiMingRenZheng, context, payload, 1000)
+      })
+    },
     SendPrize (context, payload) { // 派奖
       return new Promise((resolve, reject) => {
         ToolClass.Axios(resolve, reject, Api.SendPrize, context, payload, 1000)

src/util/Api.js

@@ -2,6 +2,10 @@
 const prefix = '/api'
 
 const $api = {
+  AliShiMingRenZheng: { // 支付宝实名认证
+    method: 'put',
+    url: `${prefix}/app/shop/:id`
+  },
   SendPrize: { // 派奖
     method: 'put',
     url: `${prefix}/shop/sent-award/order/:id`

src/util/PublicMethod.js

@@ -1,6 +1,8 @@
 /* eslint-disable */
 import Axios from 'axios'
 import qs from 'qs'
+import { APIBase } from '@/util/constant'
+
 const ToolClass = {
   ReplaceURLParams (url, params) {
     const args = { ...(params || {}), org: 'MQ' }
@@ -37,7 +39,7 @@ const ToolClass = {
       url: Url,
       data: Data,
       headers: { ...Header },
-      baseURL: process.env.NODE_ENV === 'production' ? 'http://api.xnsport.cn/' : '/'
+      baseURL: APIBase
     }
     Axios({ ...aParams }).then(res => {
       const token = res.headers['X-Authorization-JWT'] || res.headers['x-authorization-jwt'] || res.headers['X-AUTHORIZATION-JWT']

src/util/constant.js

@@ -0,0 +1,2 @@
+
+export const APIBase = process.env.NODE_ENV === 'production' ? 'https://api.xnsport.cn/' : '/'