diff --git a/components/myMain.vue b/components/myMain.vue
index ee8c6b9..6f86515 100644
--- a/components/myMain.vue
+++ b/components/myMain.vue
@@ -219,7 +219,7 @@
// #endif
that.G.Get(
that.api.bind_getCode, {
- env: _env,
+ env: 'trial',
appTag:'fdb'
},
(res) => {
diff --git a/components/quickLogin.vue b/components/quickLogin.vue
new file mode 100644
index 0000000..f4d97c4
--- /dev/null
+++ b/components/quickLogin.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 372d54a..dae80af 100644
--- a/pages.json
+++ b/pages.json
@@ -348,6 +348,17 @@
{ // 各个模块的详情页
"root": "root/detail",
"pages": [
+ {
+ "path": "userShare",
+ "style": {
+ "navigationBarTitleText": "详情", // 用户主页
+ "backgroundColor": "#ededed",
+ "backgroundColorBottom": "#ededed",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "disableScrollByUser": true
+ }
+ },
{
"path": "job",
"style": {
diff --git a/root/bind/applyForm.vue b/root/bind/applyForm.vue
index f8485e6..35edfe1 100644
--- a/root/bind/applyForm.vue
+++ b/root/bind/applyForm.vue
@@ -16,7 +16,12 @@
-
+
{{ info.recordStatus == 1 ? "申请中" : info.recordStatus == 2 ? "已关注" : "发送" }}
@@ -60,7 +65,12 @@ export default {
if (options.scene) {
var sceneStr = decodeURIComponent(options.scene);
var sceneJson = this.G.sceneToJson(sceneStr);
- this.wxCode = sceneJson.inviteCode;
+ console.log("二维码参数", sceneJson);
+ if(sceneJson.id){
+ this.wxCode = sceneJson.id.split('_')[0];
+ }else{
+ this.wxCode = '';
+ }
} else {
this.wxCode = options.code;
this.form = options.form;
diff --git a/root/bind/applyList.vue b/root/bind/applyList.vue
index b976455..55e5960 100644
--- a/root/bind/applyList.vue
+++ b/root/bind/applyList.vue
@@ -107,7 +107,7 @@
}
}
},
- created() {
+ onShow() {
this.type = 2;
this.keys = this.keyword;
this.getList();
diff --git a/root/detail/user.vue b/root/detail/user.vue
index 1ae8a25..8a977ad 100644
--- a/root/detail/user.vue
+++ b/root/detail/user.vue
@@ -30,7 +30,7 @@
>
-
+
diff --git a/root/detail/userShare.vue b/root/detail/userShare.vue
new file mode 100644
index 0000000..2172c1a
--- /dev/null
+++ b/root/detail/userShare.vue
@@ -0,0 +1,873 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ info.fullName || info.agencyName || "-" }}
+
+
+
+
+
+ {{ info.agencyName || info.fullName || "-" }}
+
+
+
+
+
+
+
+
{{ item.num }}
+
{{ item.name }}
+
+
+
+
+
{{ info.agencyDesp }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/root/person/downpage.vue b/root/person/downpage.vue
index 88603e5..d33ff05 100644
--- a/root/person/downpage.vue
+++ b/root/person/downpage.vue
@@ -26,7 +26,7 @@
新的代理申请
- 您有8条新代理加入申请待审批
+ 您有新代理加入申请待审批
diff --git a/root/person/fensi.vue b/root/person/fensi.vue
index 88e3ee3..3fe0041 100644
--- a/root/person/fensi.vue
+++ b/root/person/fensi.vue
@@ -587,18 +587,20 @@ export default {
z-index: 1;
}
- .m-search {
- // .u-icon-wrap{
- // position: absolute;
- // left: 190rpx;
- // }
- }
-
.m-search-active {
.u-icon-wrap {
position: inherit;
left: 0rpx;
}
}
+
+ .m-panel{
+ .link{
+ border-radius: 8px;
+ width: calc(100% - 20px);
+ margin: 0 auto;
+ overflow: hidden;
+ }
+ }
}