diff --git a/App.vue b/App.vue
index 9742ad5..db52928 100644
--- a/App.vue
+++ b/App.vue
@@ -12,13 +12,13 @@ export default {
}
const whiteList = [
'pages/shareRegist/index',
- // 'pages/shareRegist/success',
+ 'pages/shareRegist/success',
'pages/login/index',
// 'pages/wechatPay/bfPay/',
// 'pages/wechatPay/hfPay/',
- // 'pages/shareArea/hiList',
- // 'pages/shareArea/hiOrder',
- // 'pages/pay/hiPay'
+ 'pages/shareArea/hiList',
+ 'pages/shareArea/hiOrder',
+ 'pages/pay/hiPay',
]
if (whiteList.indexOf(options.path) !== -1) return
this.$store.dispatch('GetInfo')
diff --git a/components/address.vue b/components/address.vue
index 1691c1f..ba36a27 100644
--- a/components/address.vue
+++ b/components/address.vue
@@ -1,15 +1,15 @@
-
-
-
+
@@ -43,7 +43,9 @@ export default {
if (this.cityList.length > 0) {
this.getDefaultIndex(n)
} else {
- this.getAllAreaList(uni.getStorageSync('pkCountry')||this.user.pkSettleCountry).then((res) => {
+ this.getAllAreaList(
+ uni.getStorageSync('pkCountry') || this.user.pkSettleCountry
+ ).then(res => {
if (res) {
this.getDefaultIndex(n)
}
@@ -54,14 +56,16 @@ export default {
},
created() {
this.user = uni.getStorageSync('User')
- this.getAllAreaList(uni.getStorageSync('pkCountry')||this.user.pkSettleCountry)
+ this.getAllAreaList(
+ uni.getStorageSync('pkCountry') || this.user.pkSettleCountry
+ )
},
methods: {
getDefaultIndex(arr) {
- let a = this.provinceList.findIndex((item) => item.pkId == arr[0])
- let b = this.cityList[a].arrList.findIndex((item) => item.pkId == arr[1])
- let c = this.quList.findIndex((item) => item.pkId == arr[1])
- let d = this.quList[c].arrList.findIndex((item) => item.pkId == arr[2])
+ let a = this.provinceList.findIndex(item => item.pkId == arr[0])
+ let b = this.cityList[a].arrList.findIndex(item => item.pkId == arr[1])
+ let c = this.quList.findIndex(item => item.pkId == arr[1])
+ let d = this.quList[c].arrList.findIndex(item => item.pkId == arr[2])
this.columns = [
this.provinceList,
this.cityList[a].arrList,
@@ -83,9 +87,9 @@ export default {
return new Promise((reslove, reject) => {
api
.getAllAreaList({
- pkCountry: pkCountry,
+ pkCountry: pkCountry || 1,
})
- .then((res) => {
+ .then(res => {
this.provinceList = res.data.provinceList
// 市数组
let cityList = []
@@ -138,7 +142,7 @@ export default {
if (columnIndex === 0) {
picker.setColumnValues(1, this.cityList[indexs[0]].arrList)
let arr = []
- this.quList.forEach((item) => {
+ this.quList.forEach(item => {
if (item.pkId == this.cityList[indexs[0]].arrList[0].pkId) {
arr = item.arrList
}
@@ -147,7 +151,7 @@ export default {
// picker为选择器this实例,变化第二列对应的选项
} else if (columnIndex === 1) {
let arr = []
- this.quList.forEach((item) => {
+ this.quList.forEach(item => {
if (item.pkId == this.cityList[indexs[0]].arrList[index].pkId) {
arr = item.arrList
}
@@ -186,4 +190,4 @@ export default {
border-radius: 4px;
padding: 6px 9px;
}
-
\ No newline at end of file
+
diff --git a/config/goods.js b/config/goods.js
index 145ea18..3a91714 100644
--- a/config/goods.js
+++ b/config/goods.js
@@ -117,3 +117,7 @@ export const energyShop = params =>
//hi粉确认订单
export const energyShopSilo = params =>
http.post('/sale/api/order/valid-silo', params)
+
+// 分享注册确认订单页面获取邮费
+export const getSharePostage = params =>
+ http.post('/sale/api/retail-order/query-reg-order-postage', params)
diff --git a/pages/shareArea/hiList.vue b/pages/shareArea/hiList.vue
index 0e68991..38e358a 100644
--- a/pages/shareArea/hiList.vue
+++ b/pages/shareArea/hiList.vue
@@ -1,15 +1,18 @@
-
-