diff --git a/api/agent.js b/api/agent.js
index 76f4269..b0027d1 100644
--- a/api/agent.js
+++ b/api/agent.js
@@ -15,8 +15,10 @@ export function inviteSupplierJoinQrCode(data) {
export function getSingleAgentInfo(id) {
return request.get(`agent/single_agent_info/${id}`);
}
-
-
+// 获取单条代理人员信息
+export function getAgentConfig() {
+ return request.get(`agent/get_config`);
+}
diff --git a/components/areaSelect/index.vue b/components/areaSelect/index.vue
new file mode 100644
index 0000000..40e63b7
--- /dev/null
+++ b/components/areaSelect/index.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index c2bbeab..8f3b044 100644
--- a/pages.json
+++ b/pages.json
@@ -574,6 +574,12 @@
"style": {
"navigationBarTitleText": "积分变更记录"
}
+ },
+ {
+ "path": "write_off/index",
+ "style": {
+ "navigationBarTitleText": "优惠券核销"
+ }
}
]
},
diff --git a/pages/agent/invite/index.vue b/pages/agent/invite/index.vue
index da68f91..44e648d 100644
--- a/pages/agent/invite/index.vue
+++ b/pages/agent/invite/index.vue
@@ -1,11 +1,69 @@
+
+ {{ page_title }}
+
+
+
+
+ 邀请人
+
+
+
+
+ {{ invite_agent_info.user.nickname}}
+ UID:{{ invite_agent_info.user.uid}}
+
+
+
+
+
+
+
+ 联系人姓名
+
+
+
+
+
+ 联系人电话
+
+
+
+
+
+
+
+
+
+ 地区选择
+
+
+
+
+
+
- 邀请下级入驻
+
+
+
+ 提交
+
+
+
+
@@ -14,22 +72,40 @@
diff --git a/pages/supplier/apply/apply_join.vue b/pages/supplier/apply/apply_join.vue
index 5714a74..a86bcbb 100644
--- a/pages/supplier/apply/apply_join.vue
+++ b/pages/supplier/apply/apply_join.vue
@@ -3,7 +3,7 @@
-
+
@@ -188,7 +188,7 @@ export default {
onLoad(options) {
let _this = this;
if(options.scene){
- // console.log('转换前参数:',options.scene)
+ console.log('转换前参数:',options.scene)
let scene = _this.$util.getUrlParams(decodeURIComponent(options.scene));
// console.log("接收参数",scene)
this.apply_info.invite_agent_id = scene.agent_id || 0;
@@ -309,9 +309,6 @@ export default {
this.$util.Tips({title: err});
});
}
-
-
-
}
}
@@ -441,8 +438,10 @@ export default {
}
}
}
+ .list-item{
+ padding: 20rpx 0;
+ }
.list-item:not(:last-child){
- padding-bottom: 35rpx;
border-bottom: 1px solid #eee;
}
.submit-btn{
diff --git a/pages/users/user_coupon/index.vue b/pages/users/user_coupon/index.vue
index 395af27..561b432 100644
--- a/pages/users/user_coupon/index.vue
+++ b/pages/users/user_coupon/index.vue
@@ -18,17 +18,17 @@
¥{{item.coupon_price}}
- 满{{ item.use_min_price }}元可用
+
¥{{item.coupon_price}}
- 满{{ item.use_min_price }}元可用
+
-
+
¥{{item.coupon_price}}
- 满{{ item.use_min_price }}元可用
+
@@ -111,7 +111,7 @@
if(value){
var newDate=/\d{4}-\d{1,2}-\d{1,2}/g.exec(value)
return newDate[0]
- }
+ }
}
},
onLoad(options) {
diff --git a/pages/users/write_off/index.vue b/pages/users/write_off/index.vue
new file mode 100644
index 0000000..b27bbd4
--- /dev/null
+++ b/pages/users/write_off/index.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+ 主要内容
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/images/supplier/supplier_apply_bg.jpg b/static/images/supplier/supplier_apply_bg.jpg
deleted file mode 100644
index 0000987..0000000
Binary files a/static/images/supplier/supplier_apply_bg.jpg and /dev/null differ
diff --git a/static/images/supplier/supplier_apply_bg.png b/static/images/supplier/supplier_apply_bg.png
deleted file mode 100644
index 498759b..0000000
Binary files a/static/images/supplier/supplier_apply_bg.png and /dev/null differ
diff --git a/static/images/supplier/supplier_spply_bg.png b/static/images/supplier/supplier_spply_bg.png
deleted file mode 100644
index e78cec6..0000000
Binary files a/static/images/supplier/supplier_spply_bg.png and /dev/null differ