diff --git a/manifest.json b/manifest.json
index ffb6269..cfcd788 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
// "appid" : "__UNI__3A527D1",
"appid": "__UNI__A495155",
"description": "",
- "versionName": "1.1.1",
- "versionCode": 111,
+ "versionName": "1.1.3",
+ "versionCode": 113,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {
diff --git a/pages.json b/pages.json
index c469122..45996c1 100644
--- a/pages.json
+++ b/pages.json
@@ -12,18 +12,6 @@
"navigationBarTextStyle": "white"
}
},
- {
- "path": "pages/test/Information",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/test/choseIdentity",
- "style": {
- "navigationStyle": "custom"
- }
- },
{
"path": "pages/oaHome/homeTaskDetail",
"style": {
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index 84e258e..23ac991 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -58,10 +58,13 @@
物流信息:
用户名称: {{fuzzyName( goodsDetil.logistics.receiver_name)}}
-
+
+
+
联系电话: {{goodsDetil.logistics.shop_phone}}
+ color="#fff" size="22">{{goodsDetil.logistics.receiver_phone}}
+
联系地址: {{goodsDetil.logistics.receiver_address}}
diff --git a/pages/oaHome/FirstOrderLog.vue b/pages/oaHome/FirstOrderLog.vue
index dec18d2..d81308d 100644
--- a/pages/oaHome/FirstOrderLog.vue
+++ b/pages/oaHome/FirstOrderLog.vue
@@ -4,7 +4,7 @@
总资产(元)
- ¥ {{money.toLocaleString('zh-CN')}}
+ ¥ {{money.toLocaleString('zh-CN' ||0)}}
diff --git a/pages/oaHome/accountLog.vue b/pages/oaHome/accountLog.vue
index e0d5df8..bd08b20 100644
--- a/pages/oaHome/accountLog.vue
+++ b/pages/oaHome/accountLog.vue
@@ -5,7 +5,7 @@
收益明细(元)
- ¥ {{money}}
+ ¥ {{money ||0}}
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index f62fc45..4d2a923 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -17,8 +17,8 @@
-
-
+
+
身份:{{ myOaInfo.user_role_name}}
diff --git a/pages/test/Information.vue b/pages/test/Information.vue
deleted file mode 100644
index 6836cd8..0000000
--- a/pages/test/Information.vue
+++ /dev/null
@@ -1,982 +0,0 @@
-
-
-
-
-
-
- 户主姓名
-
-
-
-
-
-
-
- 联系方式
-
-
-
-
-
-
-
- 家庭人数
-
-
-
-
-
-
-
- 家庭地址
-
-
-
-
-
-
-
-
-
-
- 助民惠农
-
-
- {{saveNum}}/5
-
-
-
-
-
-
-
-
-
- 房子出租需求
-
-
-
-
- 展开
-
-
-
-
-
- 已完成
-
-
-
-
-
-
-
- 房子出租需求
-
-
- 保存
-
-
-
-
-
- 面积
-
-
-
-
-
-
-
- 出租年限
-
-
-
-
-
-
-
- 出租要求
-
-
-
-
-
-
-
-
- 主题结构是否完成
-
-
-
-
-
-
-
- 是否允许装修
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 空闲土地出租需求
-
-
-
-
- 展开
-
-
-
-
-
- 已完成
-
-
-
-
-
-
-
-
- 空闲土地出租需求
-
-
- 保存
-
-
-
-
-
- 是否可以种养
-
-
-
-
-
-
-
- 面积
-
-
-
-
-
-
-
- 种养要求
-
-
-
-
-
-
-
- 租金和支付方式
-
-
-
-
-
-
-
- 土地优势
-
-
-
-
-
-
-
- 土地缺点
-
-
-
-
-
-
-
- 闲置原因
-
-
-
-
-
-
-
- 使用年限
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 农副产品出售
-
-
-
-
- 展开
-
-
-
-
-
-
-
- 已完成
-
-
-
-
-
-
-
-
-
-
- 农副产品出售
-
-
- 保存
-
-
-
-
-
- 种养类型
-
-
-
-
-
-
-
- 种养面积
-
-
-
-
-
-
-
- 土地性质
-
-
-
-
-
-
-
- 种养方式
-
-
-
-
-
-
-
- 成熟周期
-
-
-
-
-
-
-
- 最近成熟时间
-
-
-
-
-
-
-
- 年产量
-
-
-
-
-
-
-
- 自己消化/市场销售
-
-
-
-
-
-
-
- 销售方式
-
-
-
-
-
-
-
- 年销量
-
-
-
-
-
-
-
- 产品名称
-
-
-
-
-
-
-
- 优势
-
-
-
-
-
-
-
- 产品有无品牌
-
-
-
-
-
-
-
- 是否进行粗加工
-
-
-
-
-
-
-
- 产品诉求
-
-
-
-
-
-
-
- 急需解决的问题
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 空闲资产出租/出售
-
-
-
-
- 展开
-
-
-
-
-
-
-
- 已完成
-
-
-
-
-
-
-
-
-
-
- 空闲资产出租/出售
-
-
- 保存
-
-
-
-
-
- 资产名称
-
-
-
-
-
-
-
- 资产优势
-
-
-
-
-
-
-
- 数量
-
-
-
-
-
-
-
- 增收方式
-
-
-
-
-
-
-
- 其他可变现
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 房屋装饰建设
-
-
-
-
- 展开
-
-
-
-
-
-
-
- 已完成
-
-
-
-
-
-
-
-
-
-
- 房屋装饰建设/出售
-
-
- 保存
-
-
-
-
-
- 施工地点
-
-
-
-
-
-
-
- 开始时间
-
-
-
-
-
-
-
- 修/建标准
-
-
-
-
-
-
-
- 事主要求
-
-
-
-
-
-
-
- 房屋建设时长
-
-
-
-
-
-
-
- 设计服务
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确认登录
-
-
-
-
-
-
- {{showText.title}}
-
-
- {{showText.content}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/test/choseIdentity.vue b/pages/test/choseIdentity.vue
deleted file mode 100644
index bf9b89d..0000000
--- a/pages/test/choseIdentity.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
- 我是居民用户
-
-
-
-
-
- 我是农民用户
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/static/test/GB.png b/static/test/GB.png
deleted file mode 100644
index 991a651..0000000
Binary files a/static/test/GB.png and /dev/null differ
diff --git a/static/test/JM.png b/static/test/JM.png
deleted file mode 100644
index 441938f..0000000
Binary files a/static/test/JM.png and /dev/null differ
diff --git a/static/test/NM.png b/static/test/NM.png
deleted file mode 100644
index b46e116..0000000
Binary files a/static/test/NM.png and /dev/null differ
diff --git a/static/test/SM.png b/static/test/SM.png
deleted file mode 100644
index a96b832..0000000
Binary files a/static/test/SM.png and /dev/null differ
diff --git a/static/test/SYBJ.png b/static/test/SYBJ.png
deleted file mode 100644
index f6779b9..0000000
Binary files a/static/test/SYBJ.png and /dev/null differ
diff --git a/static/test/XQ.png b/static/test/XQ.png
deleted file mode 100644
index 5b2005f..0000000
Binary files a/static/test/XQ.png and /dev/null differ
diff --git a/static/test/XXBG.png b/static/test/XXBG.png
deleted file mode 100644
index 5f97cb0..0000000
Binary files a/static/test/XXBG.png and /dev/null differ
diff --git a/static/test/YWC.png b/static/test/YWC.png
deleted file mode 100644
index 351e66b..0000000
Binary files a/static/test/YWC.png and /dev/null differ
diff --git a/static/test/ZK.png b/static/test/ZK.png
deleted file mode 100644
index 4d03e66..0000000
Binary files a/static/test/ZK.png and /dev/null differ
diff --git a/static/test/bg.png b/static/test/bg.png
deleted file mode 100644
index 6ad6450..0000000
Binary files a/static/test/bg.png and /dev/null differ