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

config/index.js

@@ -11,13 +11,9 @@ 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://127.0.0.1:8080',
+        // target: 'https://app.xnsport.cn',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         pathRewrite: { '^/api': '/api' }
       }

src/components/index/DingDanXiangQingDaLeTou/index.vue

@@ -12,7 +12,7 @@
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注号码</span>
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
       </div>
       <ul>
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

src/components/index/DingDanXiangQingLanQiu/index.vue

@@ -11,15 +11,15 @@
     <div class="Status">
       <ul class="flex-h">
         <li class="flex-item">
-          <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 1)}}</span>
-          <span>预计奖金(元)</span>
+          <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 2)}}</span>
+          <span>预计奖金(牛币)</span>
         </li>
         <li class="flex-item">
           <span>{{Data.bettingDetail.betting.totalPrice}}</span>
-          <span>投资金额(元)</span>
+          <span>投资金额(牛币)</span>
         </li>
         <li class="flex-item">
-          <span>{{Data.status === 1 ? '已出票' : '未出票'}}</span>
+          <span>{{ReturnOrderStatus()}}</span>
           <span>订单状态</span>
         </li>
       </ul>
@@ -28,7 +28,7 @@
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注详情</span>
-        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
+        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
       </div>
       <ul>
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">
@@ -122,6 +122,32 @@ export default {
     })
   },
   methods: {
+    ReturnOrderStatus () {
+      if (!this.Data.bettingDetail.betting.isDrawn) {
+        return '未出票'
+      } else {
+        if (!this.Data.bettingDetail.betting.isOpen) {
+          return '已出票'
+        } else {
+          if (!this.Data.bettingDetail.betting.isWinning) {
+            return '未中奖'
+          } else {
+            if (this.Data.bettingDetail.betting.isCashed) {
+              return '已派奖'
+            } else {
+              return '未派奖'
+            }
+          }
+        }
+        // if (this.Data.bettingDetail.betting.isWinning) {
+        //   return '已中奖'
+        // }
+        // if (this.Data.bettingDetail.betting.isCashed) {
+        //   return '已派奖'
+        // }
+        // return '已出票'
+      }
+    }
   }
 }
 </script>

src/components/index/DingDanXiangQingP3/index.vue

@@ -12,7 +12,7 @@
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注号码</span>
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
       </div>
       <ul>
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

src/components/index/DingDanXiangQingP5/index.vue

@@ -12,7 +12,7 @@
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注号码</span>
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
       </div>
       <ul>
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

src/components/index/DingDanXiangQingShuangSeQiu/index.vue

@@ -12,7 +12,7 @@
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注号码</span>
-        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
       </div>
       <ul>
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

src/components/index/DingDanXiangQingZuQiu/index.vue

@@ -12,11 +12,11 @@
       <ul class="flex-h">
         <li class="flex-item">
           <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 1)}}</span>
-          <span>预计奖金(元)</span>
+          <span>预计奖金(牛币)</span>
         </li>
         <li class="flex-item">
           <span>{{Data.bettingDetail.betting.totalPrice}}</span>
-          <span>投资金额(元)</span>
+          <span>投资金额(牛币)</span>
         </li>
         <li class="flex-item">
           <span>{{Data.status === 1 ? '已出票' : '未出票'}}</span>
@@ -28,7 +28,7 @@
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注详情</span>
-        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice / 100}}</em>元</span>
+        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice}}</em>牛币</span>
       </div>
       <ul>
         <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">

src/pages/PaiJiang/PaiJiangGuanLi/index.vue

@@ -37,13 +37,13 @@
                         <span class="flex-item">{{item.customerBetting.lotteryName}}</span>
                         <span>{{item.customerBetting.notesNum}}注</span>
                         <span>{{item.customerBetting.bettingTimes}}倍</span>
-                        <span><em>{{item.customerBetting.totalPrice / 100}}</em>元</span>
+                        <span><em>{{item.customerBetting.totalPrice}}</em>牛币</span>
                       </div>
                       <span>订单编号：{{item.orderId}}</span>
                       <span>出票时间：{{ToolClass.DateFormat(item.createDate)}}</span>
                       <div class="Res">
                         <span v-if="item.customerBetting.lotteryId === 'basketball' || item.customerBetting.lotteryId === 'football'">过关方式：{{item.customerBetting.bettingPlan.passName}}</span>
-                        <span>奖金：<em>{{item.customerBetting.winAmount / 100}}元</em></span>
+                        <span>奖金：<em>{{item.customerBetting.winAmount}}牛币</em></span>
                       </div>
                     </router-link>
                   </li>
@@ -59,7 +59,7 @@
           <span>全选</span> -->
           <div class="flex-item">
             <div>
-              <span>合计：<em>{{TotalPrice / 100}}元</em></span>
+              <span>合计：<em>{{TotalPrice}}牛币</em></span>
             </div>
           </div>
           <a @click="SendMoney" :class="{'active': !DataLock}">{{DataLock ? '正在提交' : '派奖'}}</a>
@@ -194,7 +194,7 @@ export default {
     },
     ToGetPageList (done = () => { }) { // 获取页面列表
       if (this.HasNextPage) {
-        let QueryData = { ...this.PageData, isCashed: true }
+        let QueryData = { ...this.PageData, isCashed: false }
         if (this.ActiveNavId !== 'all') {
           QueryData.lotteryId = this.ActiveNavId
         }

src/pages/PaiJiang/PaiJiangJiLu/index.vue

@@ -37,13 +37,13 @@
                         <span class="flex-item">{{item.customerBetting.lotteryName}}</span>
                         <span>{{item.customerBetting.notesNum}}注</span>
                         <span>{{item.customerBetting.bettingTimes}}倍</span>
-                        <span><em>{{item.customerBetting.totalPrice / 100}}</em>元</span>
+                        <span><em>{{item.customerBetting.totalPrice}}</em>牛币</span>
                       </div>
                       <span>订单编号：{{item.orderId}}</span>
                       <span>出票时间：{{ToolClass.DateFormat(item.createDate)}}</span>
                       <div class="Res">
                         <span v-if="item.customerBetting.lotteryId === 'basketball' || item.customerBetting.lotteryId === 'football'">过关方式：{{item.customerBetting.bettingPlan.passName}}</span>
-                        <span>奖金：<em>{{item.customerBetting.winAmount / 100}}元</em></span>
+                        <span>奖金：<em>{{item.customerBetting.winAmount}}牛币</em></span>
                       </div>
                     </router-link>
                   </li>

src/pages/WoDe/PaiJiangGuanLi/index.vue

@@ -37,13 +37,13 @@
                         <span class="flex-item">竞足胜平负</span>
                         <span>1注</span>
                         <span>1倍</span>
-                        <span><em>2.00</em>元</span>
+                        <span><em>2.00</em>牛币</span>
                       </div>
                       <span>订单编号：TE20200810000146179970</span>
                       <span>出票时间：2020-08-10 15:10:10</span>
                       <div class="Res">
                         <span>过关方式：2串1</span>
-                        <span>奖金：<em>5.20元</em></span>
+                        <span>奖金：<em>5.20牛币</em></span>
                       </div>
                     </div>
                   </li>
@@ -59,7 +59,7 @@
           <span>全选</span>
           <div class="flex-item">
             <div>
-              <span>合计：<em>5.20元</em></span>
+              <span>合计：<em>5.20牛币</em></span>
             </div>
           </div>
           <a>派奖</a>

src/pages/WoDe/PaiJiangJiLu/index.vue

@@ -26,13 +26,13 @@
                         <span class="flex-item">竞足胜平负</span>
                         <span>1注</span>
                         <span>1倍</span>
-                        <span><em>2.00</em>元</span>
+                        <span><em>2.00</em>牛币</span>
                       </div>
                       <span>订单编号：TE20200810000146179970</span>
                       <span>出票时间：2020-08-10 15:10:10</span>
                       <div class="Res">
                         <span>过关方式：2串1</span>
-                        <span>奖金：<em>5.20元</em></span>
+                        <span>奖金：<em>5.20牛币</em></span>
                       </div>
                     </div>
                   </li>

src/pages/WoDe/ZhiFuBaoRenZheng/index.vue

@@ -112,6 +112,9 @@
               <div class="flex-item"></div>
               <i class="iconfont iconjiantouright"></i>
             </router-link>
+            <div class="Btn">
+              <a @click="ShowQrCodeLayer = true">授权</a>
+            </div>
           </div>
 
         </div>
@@ -158,7 +161,7 @@ export default {
   data () {
     return {
       QrCodeUrl: null,
-      ShowQrCodeLayer: true,
+      ShowQrCodeLayer: false,
       ShopName: '',
       RealName: '',
       Phone: '',

src/pages/WoDe/ZhiFuBaoRenZheng/page.scss

@@ -61,6 +61,20 @@
             margin-left: 0.1rem;
           }
         }
+        > .Btn {
+          padding: 0 0.15rem;
+          margin-top: 0.2rem;
+          padding-bottom: 0.2rem;
+          > a {
+            font-size: 0.14rem;
+            color: #fff;
+            background: #d91e36;
+            border-radius: 0.06rem;
+            line-height: 0.4rem;
+            display: block;
+            text-align: center;
+          }
+        }
         > .PhotoList {
           font-size: 0;
           padding-bottom: 0.15rem 0.15rem 0;

src/pages/index/DingDanChaXun/index.vue

@@ -13,11 +13,11 @@
                       <span>竞足让球胜平负 <em>| 跟单</em></span>
                     </div>
                   </div>
-                  <span class="Grey">奖金：<em>5.20</em>元</span>
+                  <span class="Grey">奖金：<em>5.20</em>牛币</span>
                   <span>已出票</span>
                 </div>
                 <span>订单编号：TE20200810000146179970</span>
-                <span><em>2.00元</em>下单时间：2020-08-20 15:30:22</span>
+                <span><em>2.00牛币</em>下单时间：2020-08-20 15:30:22</span>
               </li>
             </ul>
           </div>

src/pages/index/DingDanXiangQing/index.vue

@@ -52,7 +52,7 @@
         </div>
 
         <div class="Bottom">
-          <a @click="ToProcessOrder" v-if="!DetailInfo.bettingDetail.betting.isDrawn" class="active">出票</a>
+          <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 v-else>撤单</a> -->
         </div>
@@ -115,14 +115,20 @@ export default {
       })
     },
     ToProcessOrder () { // 出票
-      if (this.DataLock || !this.CpImgArr.length) return
-      this.DataLock = true
-      this.ProcessOrder({ data: { lotteryPicture: this.CpImgArr[0], orderId: this.DetailInfo.orderId } }).then((res) => {
-        this.Toast(res.data.message)
-        this.DetailInfo.status = 1
-        this.DataLock = false
-      }).catch(() => {
-        this.DataLock = false
+      this.Dialog.confirm({
+        title: '',
+        message: '确认完成此单 ？'
+      }).then(() => {
+        if (this.DataLock) return
+        this.DataLock = true
+        this.ProcessOrder({ data: { lotteryPicture: this.CpImgArr.length ? this.CpImgArr[0] : null, orderId: this.DetailInfo.orderId } }).then((res) => {
+          this.Toast('出票成功')
+          this.DetailInfo.status = 1
+          this.DetailInfo.bettingDetail.betting.isDrawn = true
+          this.DataLock = false
+        }).catch(() => {
+          this.DataLock = false
+        })
       })
     },
     DeleteCpImg (index) {

src/pages/index/ShouYe/index.vue

@@ -41,13 +41,13 @@
                           </div>
                         </div>
                         <div class="Count flex-h">
-                          <span class="flex-item" v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'"><em>1</em>注<em>1</em>倍<em>2.00</em>元</span>
-                          <span class="flex-item" v-else>{{item.customerBetting.notesNum}}注{{item.customerBetting.totalPrice / 100}}元</span>
-                          <span v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'">第{{item.customerBetting.issueNo}}期</span>
+                          <span class="flex-item" v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'"><em>{{item.customerBetting.notesNum}}</em>注<em>{{item.customerBetting.bettingTimes}}</em>倍<em>{{item.customerBetting.totalPrice}}</em>牛币</span>
+                          <span class="flex-item" v-else>{{item.customerBetting.notesNum}}注{{item.customerBetting.totalPrice}}牛币</span>
                           <span>{{ToolClass.DateFormat(item.customerBetting.createDate)}}</span>
                         </div>
                       </div>
                       <div class="Time flex-h">
+                        <span v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'">第{{item.customerBetting.issueNo}}期</span>
                         <span class="flex-item"></span>
                         <router-link :to="{ name: 'DingDanXiangQing', query: {id: item.orderId} }">查看详情</router-link>
                       </div>
@@ -111,7 +111,7 @@ export default {
     },
     ToGetPageList (done = () => { }) { // 获取页面列表
       if (this.HasNextPage) {
-        this.GetCurrentShopOrderList({ queryData: { ...this.PageData } }).then((res) => {
+        this.GetCurrentShopOrderList({ queryData: { ...this.PageData, isDrawn: false } }).then((res) => {
           this.HasNextPage = res.data.data.total > this.CurrentShopOrderList.length
           done()
         }).catch(() => {

src/util/Api.js

@@ -1,5 +1,5 @@
 
-const prefix = process.env.NODE_ENV === 'production' ? '/api' : '/api'
+const prefix = '/api'
 
 const $api = {
   SendPrize: { // 派奖

src/util/Area.js

@@ -22,7 +22,7 @@ const AreaColumns = {
   "广西壮族自治区": ["南宁市", "柳州市", "桂林市", "梧州市", "北海市", "防城港市", "钦州市", "贵港市", "玉林市", "百色市", "贺州市", "河池市", "来宾市", "崇左市"],
   "海南省": ["海口市", "三亚市", "三沙市", "儋州市", "省直辖县"],
   "重庆市": ["重庆市", "县"],
-  "四川省": ["成都市", "自贡市", "攀枝花市", "泸州市", "德阳市", "绵阳市", "广元市", "遂宁市", "内江市", "乐山市", "南充市", "眉山市", "宜宾市", "广安市", "达州市", "雅安市", "巴中市", "资阳市", "阿坝藏族羌族自治州", "甘孜藏族自治州", "凉山彝族自治州"],
+  "四川省": ["成都市", "自贡市", "攀枝花市", "泸州市", "德阳市", "绵阳市", "广牛币市", "遂宁市", "内江市", "乐山市", "南充市", "眉山市", "宜宾市", "广安市", "达州市", "雅安市", "巴中市", "资阳市", "阿坝藏族羌族自治州", "甘孜藏族自治州", "凉山彝族自治州"],
   "贵州省": ["贵阳市", "六盘水市", "遵义市", "安顺市", "毕节市", "铜仁市", "黔西南布依族苗族自治州", "黔东南苗族侗族自治州", "黔南布依族苗族自治州"],
   "云南省": ["昆明市", "曲靖市", "玉溪市", "保山市", "昭通市", "丽江市", "普洱市", "临沧市", "楚雄彝族自治州", "红河哈尼族彝族自治州", "文山壮族苗族自治州", "西双版纳傣族自治州", "大理白族自治州", "德宏傣族景颇族自治州", "怒江傈僳族自治州", "迪庆藏族自治州"],
   "西藏自治区": ["拉萨市", "日喀则市", "昌都市", "林芝市", "山南市", "那曲市", "阿里地区"],

src/util/PublicMethod.js

@@ -4,7 +4,7 @@ import qs from 'qs'
 const ToolClass = {
   ReplaceURLParams (url, params) {
     const args = { ...(params || {}), org: 'MQ' }
-    return Object.keys(args).reduce((acc, k) => { // 此方法对每个元素进行处理
+    return Object.keys(args).reduce((acc, k) => { // 此方法对每个牛币素进行处理
       const re = new RegExp(`:${k}(?!w)`, 'i')
       return acc.replace(re, args[k])
     }, url)
@@ -36,10 +36,11 @@ const ToolClass = {
       method: target.method,
       url: Url,
       data: Data,
-      headers: { ...Header }
+      headers: { ...Header },
+      baseURL: process.env.NODE_ENV === 'production' ? 'http://api.xnsport.cn/' : '/'
     }
     Axios({ ...aParams }).then(res => {
-      const token = res.headers['x-authorization-jwt']
+      const token = res.headers['X-Authorization-JWT'] || res.headers['x-authorization-jwt'] || res.headers['X-AUTHORIZATION-JWT']
       if (token) { // 更新本地存储token
         window.localStorage.Jwt = token
         window.localStorage.JwtTime = Date.now()