暂存

components/area-product-list/special-area-wrapper.vue

@@ -106,11 +106,12 @@ export default {
     const userInfo = uni.getStorageSync('userInfo') || this.userInfo
     if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
       this.upgrade.name = '会员专区'
-    }
+    } else {
-    this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
       this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
       this.getAreaListById(REGIEST_AREA.id, this.registList)
       this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
+    }
+    this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
   },
   methods: {
     getAreaListById(areaId, list) {

config/goods.js

@@ -13,75 +13,108 @@
 const http = uni.$u.http
 
 //商品列表
-export const getAllGoods = (params) => http.post('/sale/api/wares/query-spe-wares', params)
+export const getAllGoods = params =>
+  http.post('/sale/api/wares/query-spe-wares', params)
 //商品详情
 // export const waresDetail = (params) => http.post('/sale/api/wares/query-spe-wares-detail', params)
-export const waresDetail = (params) => http.post('/sale/api/retail-wares/wares-detail', params)
+export const waresDetail = params =>
+  http.post('/sale/api/retail-wares/wares-detail', params)
 //嗨粉海粉短信
-export const verification = (params) => http.get('/member/api/sms/fans-verification', { params })
+export const verification = params =>
+  http.get('/member/api/sms/fans-verification', { params })
 //嗨粉选择省市区
-export const getAllAreaList = (params) => http.get('system/api/area/provinceList', { params })
+export const getAllAreaList = params =>
+  http.get('system/api/area/provinceList', { params })
 //嗨粉选择国家
-export const getCountry = (params) => http.get('system/api/country/list', { params })
+export const getCountry = params =>
+  http.get('system/api/country/list', { params })
 //海粉注册
-export const regShareMember = (params) => http.post('/member/api/member/reg-share-member', params)
+export const regShareMember = params =>
+  http.post('/member/api/member/reg-share-member', params)
 //hi粉注册
-export const hiRegister = (params) => http.post('/member/api/fans/register', params)
+export const hiRegister = params =>
+  http.post('/member/api/fans/register', params)
 //幂等性
-export const generate = (params) => http.get('/system/api/idempotent/generate', { params })
+export const generate = params =>
+  http.get('/system/api/idempotent/generate', { params })
 //发货
-export const deliveryList = (params) => http.get('/system/pub/enums/delivery-list', { params })
+export const deliveryList = params =>
+  http.get('/system/pub/enums/delivery-list', { params })
 //海粉渠道
-export const jxhhSource = (params) => http.get('/sale/api/t-source/list/' + params)
+export const jxhhSource = params =>
+  http.get('/sale/api/t-source/list/' + params)
 //海粉分类
-export const optionList = (params) => http.post('/sale/api/twares-category-category/option-list',  params )
+export const optionList = params =>
+  http.post('/sale/api/twares-category-category/option-list', params)
 //海粉商品
-export const sharingWares = (params) => http.get('/sale/api/wares/sharing-zone-wares', { params })
+export const sharingWares = params =>
+  http.get('/sale/api/wares/sharing-zone-wares', { params })
 //分享邮费查询
-export const queryAdressPostage = (params) => http.post('/sale/api/order/self-order-postage', params)
+export const queryAdressPostage = params =>
+  http.post('/sale/api/order/self-order-postage', params)
 //嗨粉分享确认订单
-export const confirmFunShareOrder = (params) => http.post('/sale/api/order/confirm-self-fun-order', params)
+export const confirmFunShareOrder = params =>
+  http.post('/sale/api/order/confirm-self-fun-order', params)
 //海粉商品详情
-export const sharingWaresDetail = (params) => http.get('/sale/api/wares/query-spe-sharing-wares-detail', { params })
+export const sharingWaresDetail = params =>
+  http.get('/sale/api/wares/query-spe-sharing-wares-detail', { params })
 //海粉订单确认
-export const confirmShareOrder = (params) => http.post('/sale/api/order/confirm-share-order', params)
+export const confirmShareOrder = params =>
+  http.post('/sale/api/order/confirm-share-order', params)
 
 //获取购物车
-export const getShopping = (params) => http.get('/sale/api/shopping/getShopping', { params })
+export const getShopping = params =>
+  http.get('/sale/api/shopping/getShopping', { params })
 //分类列表
-export const classifyList = (params) => http.get('/sale/api/area-classify/list', { params })
+export const classifyList = params =>
+  http.get('/sale/api/area-classify/list', { params })
 //加减购物车
-export const plusReduceShopping = (params) => http.post('/sale/api/shopping/plusReduceShopping', params)
+export const plusReduceShopping = params =>
+  http.post('/sale/api/shopping/plusReduceShopping', params)
 //多删购物车
-export const batchDelShopping = (params) => http.post('/sale/api/shopping/batchDelShopping', params)
+export const batchDelShopping = params =>
+  http.post('/sale/api/shopping/batchDelShopping', params)
 //添加购物车
-export const addShopping = (params) => http.post('/sale/api/shopping/addShopping', params)
+export const addShopping = params =>
+  http.post('/sale/api/shopping/addShopping', params)
 //菜单权限
-export const menuList = (params) => http.get('/system/api/menu/list', { params })
+export const menuList = params => http.get('/system/api/menu/list', { params })
 //海粉分享
-export const shareCode = (params) => http.get('/member/api/share/share-code-h5', { params })
+export const shareCode = params =>
+  http.get('/member/api/share/share-code-h5', { params })
 //嗨粉分享
-export const fansCode = (params) => http.get('/member/api/share/fans-code-h5', { params })
+export const fansCode = params =>
+  http.get('/member/api/share/fans-code-h5', { params })
 //获取购物车数量
-export const getShoppingCount = (params) => http.get('/sale/api/shopping/getShoppingCount', { params })
+export const getShoppingCount = params =>
+  http.get('/sale/api/shopping/getShoppingCount', { params })
 //获取购物车数小
-export const getSmallCount = (params) => http.get('/sale/api/shopping/getAreaShoppingCount', { params })
+export const getSmallCount = params =>
+  http.get('/sale/api/shopping/getAreaShoppingCount', { params })
 //获取分享前缀
-export const prefix = (params) => http.get('/member/api/member/query-country-prefix/' + params, )
+export const prefix = params =>
+  http.get('/member/api/member/query-country-prefix/' + params)
 //校验分享编号
-export const validateMember = (params) => http.get('/member/api/member/validate-share-member/' + params, )
+export const validateMember = params =>
+  http.get('/member/api/member/validate-share-member/' + params)
 
 //获取国家
-export const currencyList = (params) => http.get('/system/api/country/list' , {params} )
+export const currencyList = params =>
+  http.get('/system/api/country/list', { params })
 //0元注册时
-export const checkShare = (params) => http.get('/member/api/share/check-share-code' , {params} )
+export const checkShare = params =>
+  http.get('/member/api/share/check-share-code', { params })
 
 //海粉订单详情
-export const waresinfo = (params) => http.post('/sale/api/wares/query-confirm-waresinfo', params)
+export const waresinfo = params =>
+  http.post('/sale/api/wares/query-confirm-waresinfo', params)
 
 //hi粉确认订单
-export const fansConfirm = (params) => http.post('/sale/api/order/fans-confirm-order', params)
+export const fansConfirm = params =>
+  http.post('/sale/api/retail-order/fans-confirm-order', params)
 //购物车注册下单校验弹框
-export const energyShop = (params) => http.post('/sale/api/wares/query-energy-silo', params)
+export const energyShop = params =>
+  http.post('/sale/api/wares/query-energy-silo', params)
 //hi粉确认订单
-export const energyShopSilo = (params) => http.post('/sale/api/order/valid-silo', params)
+export const energyShopSilo = params =>
+  http.post('/sale/api/order/valid-silo', params)

pages/index/index.vue

@@ -28,7 +28,7 @@
           </swiper>
         </view>
       </view>
-      <view style="padding-bottom: 140rpx">
+      <view v-if="specialAreaVisible" style="padding-bottom: 140rpx">
         <special-area-wrapper :userInfo="userInfo" size="small" />
       </view>
 
@@ -129,6 +129,9 @@ export default {
   },
   computed: {
     ...mapGetters(['priceSymbol', 'priceSymbolVisible', 'isZeroLevel']),
+    specialAreaVisible() {
+      return this.userInfo && Object.keys(this.userInfo).length > 0
+    },
   },
   onLoad() {
     // this.getLanguage();

pages/pay/hiPay.vue

@@ -428,7 +428,9 @@ export default {
         if (res.data) {
           this.isLoading = false
           this.isPw = false
+          uni.hideLoading()
           removeToken()
+
           this.$refs.successDialog.showSuccess(res.data)
         } else {
           getRegisterInfoTimeoutFlag = setTimeout(() => {

pages/pay/index.vue

@@ -875,9 +875,7 @@ export default {
     stringToBoolean(str) {
       return str === 'true' ? true : false
     },
-    //查询充值抽奖次数
     getLuckdrawDetail() {
-      // 抽奖支付处理（查询订单支付信息以及显示等）
       act
         .getLuckdrawDetail({
           pkBaseId: this.luckydrawData.pkBaseId,
@@ -1396,7 +1394,6 @@ export default {
       return new Promise((resolve, reject) => {
         api.payConfig().then(res => {
           this.payList = res.data
-          console.log(this.payList)
           resolve(res.data)
         })
       })