张延森 4 лет назад
Родитель
Сommit
a6beb98dfb

+ 4
- 2
src/pages/PaiJiang/PaiJiangGuanLi/index.vue Просмотреть файл

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

+ 1
- 1
src/pages/SignUp/index.vue Просмотреть файл

174
     ToShopSignUp () {
174
     ToShopSignUp () {
175
       if (!this.CheckFormData() || this.DataLock) return
175
       if (!this.CheckFormData() || this.DataLock) return
176
       this.DataLock = true
176
       this.DataLock = true
177
-      this.ShopSignUp({ data: { ...this.FormData } }).then((res) => {
177
+      this.ShopSignUp({ data: { ...this.FormData, password: md5(this.FormData.password) } }).then((res) => {
178
         this.Toast(res.data.message)
178
         this.Toast(res.data.message)
179
         this.DataLock = false
179
         this.DataLock = false
180
         this.SignIn({ data: { password: md5(this.FormData.password), userName: this.FormData.phone } }).then(() => { // 登录
180
         this.SignIn({ data: { password: md5(this.FormData.password), userName: this.FormData.phone } }).then(() => { // 登录

+ 5
- 2
src/pages/index/DingDanXiangQing/index.vue Просмотреть файл

53
 
53
 
54
         <div class="Bottom">
54
         <div class="Bottom">
55
           <a @click="ToProcessOrder" v-if="!DetailInfo.bettingDetail.betting.isDrawn" class="active">确定</a>
55
           <a @click="ToProcessOrder" v-if="!DetailInfo.bettingDetail.betting.isDrawn" class="active">确定</a>
56
-          <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>
56
+          <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>
57
           <!-- <a v-else>撤单</a> -->
57
           <!-- <a v-else>撤单</a> -->
58
         </div>
58
         </div>
59
       </div>
59
       </div>
62
 </template>
62
 </template>
63
 
63
 
64
 <script>
64
 <script>
65
+import { createNamespacedHelpers } from 'vuex'
65
 import MainPageContainer from '../../../components/common/MainPageContainer'
66
 import MainPageContainer from '../../../components/common/MainPageContainer'
66
 import DingDanXiangQingDaLeTou from '../../../components/index/DingDanXiangQingDaLeTou'
67
 import DingDanXiangQingDaLeTou from '../../../components/index/DingDanXiangQingDaLeTou'
67
 import DingDanXiangQingShuangSeQiu from '../../../components/index/DingDanXiangQingShuangSeQiu'
68
 import DingDanXiangQingShuangSeQiu from '../../../components/index/DingDanXiangQingShuangSeQiu'
69
 import DingDanXiangQingLanQiu from '../../../components/index/DingDanXiangQingLanQiu'
70
 import DingDanXiangQingLanQiu from '../../../components/index/DingDanXiangQingLanQiu'
70
 import DingDanXiangQingP3 from '../../../components/index/DingDanXiangQingP3'
71
 import DingDanXiangQingP3 from '../../../components/index/DingDanXiangQingP3'
71
 import DingDanXiangQingP5 from '../../../components/index/DingDanXiangQingP5'
72
 import DingDanXiangQingP5 from '../../../components/index/DingDanXiangQingP5'
72
-import { createNamespacedHelpers } from 'vuex'
73
+import { APIBase } from '@/util/constant'
74
+
73
 const { mapActions: mapUserActions } = createNamespacedHelpers('user')
75
 const { mapActions: mapUserActions } = createNamespacedHelpers('user')
74
 export default {
76
 export default {
75
   name: 'index',
77
   name: 'index',
79
       Origin: window.location.origin,
81
       Origin: window.location.origin,
80
       CpImgArr: [],
82
       CpImgArr: [],
81
       DetailInfo: null,
83
       DetailInfo: null,
84
+      APIBase,
82
       DataLock: false // 数据锁
85
       DataLock: false // 数据锁
83
     }
86
     }
84
   },
87
   },

+ 3
- 1
src/util/PublicMethod.js Просмотреть файл

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

+ 2
- 0
src/util/constant.js Просмотреть файл

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