diff --git a/yudao-ui-admin/src/api/cremb/logistics.js b/yudao-ui-admin/src/api/cremb/logistics.js
index 7821036d7..5f7855840 100644
--- a/yudao-ui-admin/src/api/cremb/logistics.js
+++ b/yudao-ui-admin/src/api/cremb/logistics.js
@@ -143,6 +143,15 @@ export function shippingRegion(data) {
})
}
+// 物流运费模板指定不配送
+export function shippingNodelivery(data) {
+ return request({
+ url: 'admin/express/shipping/no_delivery/list',
+ method: 'get',
+ params: { ...data }
+ })
+}
+
// 物流运费模板新增
export function shippingSave(data) {
return request({
diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
index 6b7038c94..4fbafa4d8 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
@@ -168,6 +168,7 @@
import * as logistics from '@/api/cremb/logistics'
import { Loading } from 'element-ui'
import {Debounce} from '@/utils/validate'
+import {shippingNodelivery} from "@/api/cremb/logistics";
const defaultRole = {
name: '',
type: 1,
@@ -357,6 +358,10 @@ export default {
if (info.appoint) {
this.shippingFree()
}
+ // 指定不包邮
+ if(info.noDelivery){
+ this.shippingNodelivery()
+ }
}).catch(res => {
// console.integralLog(res)
this.$message.error(res.message)
@@ -379,10 +384,24 @@ export default {
shippingFree() {
logistics.shippingFree({ tempId: this.tempId }).then(res => {
res.data.forEach((item, index) => {
- item.title = JSON.parse(item.title)
- item.city_ids = item.title
+ // item.title = JSON.parse(item.title)
+ item.city_ids = item.cityId.split(',')
})
this.ruleForm.free = res.data
+ console.log(this.ruleForm.free )
+
+ })
+ },
+ // 包邮
+ shippingNodelivery() {
+ logistics.shippingNodelivery({ tempId: this.tempId }).then(res => {
+ res.data.forEach((item, index) => {
+ // item.title = JSON.parse(item.title)
+ item.city_ids = item.cityId.split(',')
+ })
+ this.ruleForm.noDelivery = res.data
+ console.log(this.ruleForm.noDelivery )
+
})
},
removeChild(list){
@@ -443,9 +462,7 @@ export default {
}
this.ruleForm.region.forEach((el, index) => {
if(el.city_ids.length > 0){
- el.cityId = el.city_ids.map(item => {
- return item[2]
- }).join(',')
+ el.cityId = JSON.stringify(el.city_ids)
}else{
el.cityId = 'all'
}
@@ -467,9 +484,7 @@ export default {
if (this.ruleForm.appoint) {
this.ruleForm.free.forEach((el, index) => {
if(el.city_ids.length > 0){
- el.cityId = el.city_ids.map(item => {
- return item[2]
- }).join(',')
+ el.cityId = JSON.stringify(el.city_ids)
}else{
el.cityId = 'all'
}
diff --git a/yudao-ui-app/api/member.js b/yudao-ui-app/api/member.js
index 8e3ef8e34..6f93e6d05 100644
--- a/yudao-ui-app/api/member.js
+++ b/yudao-ui-app/api/member.js
@@ -15,6 +15,20 @@ export function memberOrderInfo(){
return request.get('api/order/member/memberOrderInfo', {})
}
+/**
+ * 查询权益档位信息
+ */
+export function query(phone){
+ return request.get(`shop/refund-fee-record/query?phone=${phone}`, {})
+}
+
+/**
+ * 查询档位返费信息
+ */
+export function memberQuery(reportId){
+ return request.get(`shop/refund-fee-record/query-item?reportId=${reportId}`, {})
+}
+
/**
* 根据手机号查询档次信息
*/
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 115212c27..da66973c9 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -10,6 +10,18 @@
// }
}
},
+ {
+ "path": "pages/member_loding/index",
+ "style": {
+ "navigationBarTitleText": "会员"
+ }
+ },
+ {
+ "path": "pages/member_detail/index",
+ "style": {
+ "navigationBarTitleText": "权益明细"
+ }
+ },
{
"path": "pages/member_equity/index",
"style": {
@@ -577,27 +589,28 @@
// {
// "pagePath": "pages/index/index",
// "iconPath": "static/images/tabbar/nav_icon_shop.png",
- // "selectedIconPath": "static/images/1-002.png",
+ // "selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png",
// "text": "商城"
// },
- // {
- // "pagePath": "pages/goods_cate/goods_cate",
- // "iconPath": "static/images/tabbar/nav_icon_sort.png",
- // "selectedIconPath": "static/images/2-002.png",
- // "text": "分类"
- // },
+
{
"pagePath": "pages/member_application/index",
- "iconPath": "static/images/2-001.png",
+ "iconPath": "static/images/tabbar/nav_icon_member.png",
"selectedIconPath": "static/images/tabbar/nav_icon_member_active.png",
"text": "会员申请"
},
{
"pagePath": "pages/member_equity/index",
- "iconPath": "static/images/2-001.png",
+ "iconPath": "static/images/tabbar/nav_icon_member.png",
"selectedIconPath": "static/images/tabbar/nav_icon_member_active.png",
"text": "会员申请",
"visible":false
+ },
+ {
+ "pagePath": "pages/goods_cate/goods_cate",
+ "iconPath": "static/images/tabbar/nav_icon_sort.png",
+ "selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png",
+ "text": "分类"
},
// {
// "pagePath": "pages/order_addcart/order_addcart",
diff --git a/yudao-ui-app/pages/goods_details/index.vue b/yudao-ui-app/pages/goods_details/index.vue
index 1cb2e3f67..93635dd6d 100644
--- a/yudao-ui-app/pages/goods_details/index.vue
+++ b/yudao-ui-app/pages/goods_details/index.vue
@@ -105,7 +105,7 @@
-->
-
+
+
-
+ -->
@@ -167,11 +167,11 @@
-
+
@@ -954,9 +954,9 @@
} else {
obj.type = "";
}
- getCoupons(obj).then(res => {
- that.$set(that.coupon, 'list', res.data);
- });
+ // getCoupons(obj).then(res => {
+ // that.$set(that.coupon, 'list', res.data);
+ // });
},
tabCouponType(type) {
this.$set(this.coupon, 'type', type);
diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue
index dd37bbd7b..92b2bcd13 100644
--- a/yudao-ui-app/pages/member_application/index.vue
+++ b/yudao-ui-app/pages/member_application/index.vue
@@ -27,6 +27,7 @@
+
@@ -37,13 +38,10 @@
-
-
-
-
-
-
-
+
+
+
+
@@ -60,18 +58,16 @@
},
data() {
return {
- title:'管理',
- list: [
- {
- name:'购买记录',
- fontSize:'28'
- },
- {
- name:'为他人充值',
- fontSize:'28'
- },
- ],
- show: false,
+ // list: [
+ // {
+ // name:'购买记录',
+ // fontSize:'28'
+ // },
+ // {
+ // name:'为他人充值',
+ // fontSize:'28'
+ // },
+ // ],
memberData: [],
payInfo: {
userPhone: '',
@@ -96,16 +92,17 @@
form: {
phone: ''
},
-
+ show:true,
+ ref:null
};
},
async onLoad() {
- uni.showLoading({
- title: '加载中',
- mask: true
- });
try{
+ uni.showLoading({
+ title: '加载中',
+ mask: true
+ });
const res = await memberGradeInfo()
if(res.data.some((item) => !!parseInt(item.isExist))){
uni.setTabBarItem({
@@ -120,9 +117,6 @@
index: 0,
pagePath: '/pages/member_application/index'
})
- uni.switchTab({
- url:'/pages/member_application/index'
- })
}
this.memberData = res.data
} finally{
@@ -130,7 +124,11 @@
}
},
methods: {
-
+ handleOther(){
+ uni.navigateTo({
+ url:'/pages/member_others/index'
+ })
+ },
handleSelect(value){
switch (value.name){
case "购买记录":
@@ -225,15 +223,14 @@
diff --git a/yudao-ui-app/pages/member_detail/index.vue b/yudao-ui-app/pages/member_detail/index.vue
new file mode 100644
index 000000000..2193869bf
--- /dev/null
+++ b/yudao-ui-app/pages/member_detail/index.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+ {{item.tradeTime}}
+
+ {{item.businessName}}
+
+
+ 【{{list[list.findIndex((i) => item.gear == i.name)].value}}】元 档
+ 交易金额:{{item.money}}
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue
index ee6c7d1ac..31cf1db87 100644
--- a/yudao-ui-app/pages/member_equity/index.vue
+++ b/yudao-ui-app/pages/member_equity/index.vue
@@ -8,8 +8,18 @@
会员积分:{{memberDetail.integral}}
再升1级即可获得【XX】等6项权益
+
+
+ 购买记录
+
+
+
+ 为他人充值
+
+
+
-
+
会员等级{{vipData.findIndex((item) => item == memberDetail.grade) +1}}级
@@ -23,47 +33,43 @@
查看权益>
-
+
-
- 办理日期:2021.12.30
+
+ 办理日期:{{item.startTime}}
已返回金额(元)
- 80
- 查看明细>
+ {{item.totalMoney}}
+ 查看明细>
- 已返回金额(元)
- 80
+ 带返还金额 (元)
+ {{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}
- 已返回金额(元)
- 80
+ 带返还期额
+ {{item.frequency}}x12
- 已返回金额(元)
- 80
-
-
-
-
-
-
-
-
-
-
-
+ 返费结束时间
+ {{item.endTime}}
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue
index 9b3208a53..37371e058 100644
--- a/yudao-ui-app/pages/member_others/index.vue
+++ b/yudao-ui-app/pages/member_others/index.vue
@@ -508,7 +508,7 @@
.box-submit {
background: linear-gradient(#FFC82B, #FD7A32);
- margin-top: 127rpx;
+ margin-top: 9%;
display: flex;
justify-content: center;
align-items: center;
diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue
index b5de68658..2e8a02e02 100644
--- a/yudao-ui-app/pages/member_renew/index.vue
+++ b/yudao-ui-app/pages/member_renew/index.vue
@@ -461,7 +461,7 @@ import store from '@/store/index';
.box-submit {
background: linear-gradient(#FFC82B, #FD7A32);
- margin-top: 127rpx;
+ margin-top: 9%;
display: flex;
justify-content: center;
align-items: center;
diff --git a/yudao-ui-app/static/images/others-button.png b/yudao-ui-app/static/images/others-button.png
new file mode 100644
index 000000000..9c5010274
Binary files /dev/null and b/yudao-ui-app/static/images/others-button.png differ
diff --git a/yudao-ui-app/static/images/others-right.png b/yudao-ui-app/static/images/others-right.png
new file mode 100644
index 000000000..d4f1acd25
Binary files /dev/null and b/yudao-ui-app/static/images/others-right.png differ
diff --git a/yudao-ui-app/static/images/shopping-right.png b/yudao-ui-app/static/images/shopping-right.png
new file mode 100644
index 000000000..cdc755631
Binary files /dev/null and b/yudao-ui-app/static/images/shopping-right.png differ