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

config/index.js

@@ -11,16 +11,16 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      // '/api': {
-      //   target: 'http://123.57.65.31:9004',
-      //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
-      //   pathRewrite: { '^/api': '/api' }
-      // },
       '/api': {
-        target: 'https://app.xnsport.cn',
+        target: 'http://123.57.65.31:9004',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         pathRewrite: { '^/api': '/api' }
-      }
+      },
+      // '/api': {
+      //   target: 'https://app.xnsport.cn',
+      //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
+      //   pathRewrite: { '^/api': '/api' }
+      // }
       // '/app-api': {
       //   target: 'http://ycapi.jcjyhn.com',
       //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

src/pages/WoDe/ChongZhi/index.vue

@@ -7,7 +7,7 @@
           <input type="number" placeholder="请输入充值牛币数量" v-model="Amount">
         </div>
         <div class="Btn">
-          <a @click="ToCashOut">确定</a>
+          <a @click="ToPayForAli">确定</a>
         </div>
       </div>
     </MainPageContainer>
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-import md5 from 'js-md5'
 import MainPageContainer from '../../../components/common/MainPageContainer'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
@@ -52,28 +51,16 @@ export default {
     ]),
     Init () {
     },
-    ToCashOut () {
-      // if (this.Amount === '') {
-      //   this.Toast('提现金额不能为空')
-      //   return false
-      // }
-      // if (this.Amount - 0 > this.UserInfo.account.cash - 0) {
-      //   this.Toast('提现金额不能大于账户余额')
-      //   return false
-      // }
-      // if (this.Password === '') {
-      //   this.Toast('提现密码不能为空')
-      //   return false
-      // }
-      if (this.DataLock) return
-      this.DataLock = true
-      this.CashOut({ data: { amount: this.Amount * 100, cashPass: md5(this.Password) } }).then((res) => {
-        this.Toast('提现成功')
-        this.DataLock = false
-      }).catch((res) => {
-        this.Toast(res.data.message)
-        this.DataLock = false
-      })
+    ToPayForAli () {
+      if (this.Amount === '') {
+        this.Toast('充值牛逼数量不能为空')
+        return false
+      }
+      if (this.Amount - 0 <= 0) {
+        this.Toast('充值牛逼数量必须为正整数')
+        return false
+      }
+      window.location.href = `/api/app/alipay/deposit?amount=${this.Amount - 0}&returlURL=${encodeURIComponent(`${window.location.origin}/#/WoDe/ChongZhiZhuangTai`)}&token=${window.localStorage.Jwt}`
     }
   }
 }

src/pages/WoDe/ChongZhiZhuangTai/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="Page">
+    <MainPageContainer @UserInfoChange="Init" :ShowMainHeader="true" MainHeaderTitle="订单状态" :ShowMainHeaderRight="true" :MainHeaderRightText="`完成`" :MainHeaderRightClick="() => { $router.push({ name: 'index' }) }">
+      <div class="PageContainer">
+        <div class="centerLabel">
+          <i class="iconfont iconshibai" v-if="OrderStatus === 'Error'"></i>
+          <span v-if="OrderStatus === 'Error'">待支付</span>
+          <i class="iconfont iconchenggong active" v-if="OrderStatus === 'Success'"></i>
+          <span v-if="OrderStatus === 'Success'">支付成功</span>
+          <router-link :to="{ name: 'index' }">返回首页</router-link>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import MainPageContainer from '../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapActions: mapUserActions } = createNamespacedHelpers('user')
+export default {
+  name: 'index',
+  data () {
+    return {
+      OrderStatus: null,
+      LocationOrigin: encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${this.$route.query.id}`),
+      Jwt: window.localStorage.Jwt
+    }
+  },
+  computed: {
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserActions([
+      'GetAliPayStatus'
+    ]),
+    Init () { // 初始化
+      if (this.$route.query.orderId !== undefined) {
+        this.GetAliPayStatus({ urlData: { id: this.$route.query.orderId } }).then((res) => {
+          this.OrderStatus = res.data.data === 1 ? 'Success' : 'Error'
+        })
+      }
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/ChongZhiZhuangTai/page.scss

@@ -0,0 +1,43 @@
+.Page {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow: hidden;
+    > div {
+      width: 100%;
+      text-align: center;
+      > i {
+        font-size: 1rem;
+        color: #f10404;
+        &.active {
+          color: #39ce09;
+        }
+      }
+      > span {
+        display: block;
+        text-align: center;
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        margin-top: 0.2rem;
+        + a {
+          margin-top: 0.4rem;
+        }
+      }
+      > a {
+        width: 80%;
+        display: block;
+        font-size: 0.14rem;
+        color: #fff;
+        line-height: 0.4rem;
+        border-radius: 0.06rem;
+        background: #ff5100;
+        margin: 0.2rem auto 0;
+      }
+    }
+  }
+}

src/pages/index/DaLeTouDingDan/index.vue

@@ -222,10 +222,13 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=DaLeTou`
+        this.$router.push({ name: 'DingDanZhiFuZhuangTai', query: { orderId: res.data.data.orderId } })
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
+        if (res.data.code - 0 === 1003) {
+          this.$router.push({ name: 'ChongZhi' })
+        }
       })
     },
     SwitchChange () { // 追加状态改变

src/pages/index/DingDanZhiFuZhuangTai/index.vue

@@ -7,7 +7,7 @@
           <span v-if="OrderStatus === 'Error'">待支付</span>
           <i class="iconfont iconchenggong active" v-if="OrderStatus === 'Success'"></i>
           <span v-if="OrderStatus === 'Success'">支付成功</span>
-          <a v-if="OrderStatus === 'Error'" :href="`/api/app/order/alipay/betting?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}&routerName=${$route.query.routerName}`">重新支付</a>
+          <!-- <a v-if="OrderStatus === 'Error'" :href="`/api/app/order/alipay/betting?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}&routerName=${$route.query.routerName}`">重新支付</a> -->
           <router-link :to="{ name: 'index' }">返回首页</router-link>
           <router-link :to="{ name: 'CaiPiaoXiangQing', query: { id: $route.query.bettingId } }">查看投注</router-link>
         </div>

src/pages/index/LanQiuDingDan/index.vue

@@ -231,10 +231,13 @@ export default {
         this.TotalPrice = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=LanQiu`
+        this.$router.push({ name: 'DingDanZhiFuZhuangTai', query: { orderId: res.data.data.orderId } })
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
+        if (res.data.code - 0 === 1003) {
+          this.$router.push({ name: 'ChongZhi' })
+        }
       })
     },
     ToGetStoreList () { // 获取店铺列表

src/pages/index/PaiLie3DingDan/index.vue

@@ -289,10 +289,13 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=PaiLie3`
+        this.$router.push({ name: 'DingDanZhiFuZhuangTai', query: { orderId: res.data.data.orderId } })
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
+        if (res.data.code - 0 === 1003) {
+          this.$router.push({ name: 'ChongZhi' })
+        }
       })
     },
     EmptyCart () { // 清空购物车

src/pages/index/PaiLie5DingDan/index.vue

@@ -261,10 +261,13 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=PaiLie5`
+        this.$router.push({ name: 'DingDanZhiFuZhuangTai', query: { orderId: res.data.data.orderId } })
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
+        if (res.data.code - 0 === 1003) {
+          this.$router.push({ name: 'ChongZhi' })
+        }
       })
     },
     SelectStore (item) { // 选择店铺

src/pages/index/ShuangSeQiuDingDan/index.vue

@@ -212,10 +212,13 @@ export default {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=ShuangSeQiu`
+        this.$router.push({ name: 'DingDanZhiFuZhuangTai', query: { orderId: res.data.data.orderId } })
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
+        if (res.data.code - 0 === 1003) {
+          this.$router.push({ name: 'ChongZhi' })
+        }
       })
     },
     SelectStore (item) { // 选择店铺

src/pages/index/ZuQiuDingDan/index.vue

@@ -232,10 +232,13 @@ export default {
         this.TotalPrice = 0
         this.Multiple = 1
         this.DataLock = false
-        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}&bettingId=${res.data.data.bettingId}`)}&token=${window.localStorage.Jwt}&routerName=ZuQiu`
+        this.$router.push({ name: 'DingDanZhiFuZhuangTai', query: { orderId: res.data.data.orderId } })
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
+        if (res.data.code - 0 === 1003) {
+          this.$router.push({ name: 'ChongZhi' })
+        }
       })
     },
     ToGetStoreList () { // 获取店铺列表

src/router/index.js

@@ -367,6 +367,13 @@ let router = new Router({
             component: resolve => {
               require(['@/pages/WoDe/ChongZhi'], RouterLoading.resolve(resolve))
             }
+          },
+          {
+            path: '/WoDe/ChongZhiZhuangTai', // 充值状态
+            name: 'ChongZhiZhuangTai',
+            component: resolve => {
+              require(['@/pages/WoDe/ChongZhiZhuangTai'], RouterLoading.resolve(resolve))
+            }
           }
         ]
       },