From cc453c8d4eae86f49814169079235e39d75ade68 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 27 Jan 2024 15:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/activity.js | 4 +-
config/app.js | 6 +
pages.json | 32 +-
pages/helpPeople/formTable.vue | 994 ++++++++++++++++++
pages/helpPeople/helpPeople.vue | 84 ++
.../activityDetail/activityDetail.vue | 3 +-
pages/newActivity/giftBag/giftBag.vue | 239 +++--
pages/newActivity/invitation/invitation.vue | 3 +-
pages/newActivity/subsidy/subsidy2.vue | 5 +-
pages/newActivity/subsidy/subsidy3.vue | 5 +-
pages/newActivity/towPrice/towPrice.vue | 3 +-
pages/redpacket/redpack_type.vue | 64 +-
static/active/redpack_type_img.webp | Bin 0 -> 178034 bytes
13 files changed, 1287 insertions(+), 155 deletions(-)
create mode 100644 pages/helpPeople/formTable.vue
create mode 100644 pages/helpPeople/helpPeople.vue
create mode 100644 static/active/redpack_type_img.webp
diff --git a/api/activity.js b/api/activity.js
index 5ca75fe..0f17fae 100644
--- a/api/activity.js
+++ b/api/activity.js
@@ -302,7 +302,9 @@ export function storeActivityQrcode(data) {
// 活动商品专区
export function storeActivityProduct(data) {
- return request.get(`storeActivity/product`, data);
+ return request.get(`storeActivity/product`, data, {
+ noAuth: true
+ });
}
// 活动区域列表
diff --git a/config/app.js b/config/app.js
index cee47b2..5d52a61 100644
--- a/config/app.js
+++ b/config/app.js
@@ -8,6 +8,7 @@ let httpApiTwo
let httpApiThree
let httpApiFour
let httpApiFive
+let httpApiSix
let wsApi
// 在打包之前请检查当前环境是否正确
@@ -21,6 +22,7 @@ switch (env) {
httpApiTwo = 'https://nk.lihaink.cn'
httpApiThree = 'http://ceshi-oa.lihaink.cn'
httpApiFour = 'https://worker-task.lihaink.cn'
+ httpApiSix = 'https://new-worker.lihaink.cn'
wsApi = 'wss://shop.lihaink.cn'
break;
case 'prew':
@@ -28,6 +30,7 @@ switch (env) {
httpApiTwo = "https://nk.lihaink.cn"
httpApiThree = 'http://ceshi-oa.lihaink.cn'
httpApiFour = 'https://preview-worker-task.lihaink.cn'
+ httpApiSix = 'https://ceshi-new-wokr.lihaink.cn'
wsApi = 'wss://test.shop.lihaink.cn'
break;
default:
@@ -36,6 +39,7 @@ switch (env) {
httpApiThree = 'http://ceshi-oa.lihaink.cn'
httpApiFour = 'https://ceshi-worker-task.lihaink.cn'
httpApiFive = 'https://ceshi-zhibo.lihaink.cn'
+ httpApiSix = 'https://ceshi-new-wokr.lihaink.cn'
wsApi = 'wss://crmeb-test.shop.lihaink.cn'
}
@@ -55,6 +59,7 @@ module.exports = {
HTTP_REQUEST_URL_THREE: httpApiThree,
HTTP_REQUEST_URL_FOUR: httpApiFour,
HTTP_REQUEST_URL_FIVE: httpApiFive,
+ HTTP_REQUEST_URL_SIX: httpApiSix,
VUE_APP_WS_URL: `${wsApi}?type=user`,
VUE_APP_WS_URL_ONE:wsApi_one,
// #endif
@@ -64,6 +69,7 @@ module.exports = {
HTTP_REQUEST_URL: process.env.NODE_ENV == 'development'? httpApi : window.location.protocol + "//" + window.location.host,
HTTP_REQUEST_URL_TWO: httpApiTwo,
HTTP_REQUEST_URL_FIVE: httpApiFive,
+ HTTP_REQUEST_URL_SIX: httpApiSix,
HTTP_REQUEST_URL_FOUR: window.location.host == 'shop.lihaink.cn' ?'https://worker-task.lihaink.cn':window.location.host == 'test.shop.lihaink.cn'?'https://preview-worker-task.lihaink.cn':'https://ceshi-worker-task.lihaink.cn',
// 聊天长连接地址
diff --git a/pages.json b/pages.json
index a8ba8c6..ba6439d 100644
--- a/pages.json
+++ b/pages.json
@@ -240,7 +240,7 @@
"style" :
{
"navigationBarTitleText" : "红包余额",
- "enablePullDownRefresh": true,
+ "enablePullDownRefresh": false,
"navigationStyle": "custom",
"onReachBottomDistance": 300
}
@@ -250,7 +250,7 @@
"style" :
{
"navigationBarTitleText" : "实物通用红包",
- "enablePullDownRefresh": true,
+ "enablePullDownRefresh": false,
"navigationStyle": "custom",
"onReachBottomDistance": 300
}
@@ -260,7 +260,7 @@
"style" :
{
"navigationBarTitleText" : "现金抵扣红包",
- "enablePullDownRefresh": true,
+ "enablePullDownRefresh": false,
"navigationStyle": "custom",
"onReachBottomDistance": 300
}
@@ -270,7 +270,7 @@
"style" :
{
"navigationBarTitleText" : "两元专区",
- "enablePullDownRefresh": true,
+ "enablePullDownRefresh": false,
"navigationStyle": "custom",
"onReachBottomDistance": 300
}
@@ -288,7 +288,29 @@
"style" :
{
"navigationBarTitleText" : "新人礼包",
- "enablePullDownRefresh" : false
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom",
+ "onReachBottomDistance": 300
+ }
+ },
+ {
+ "path" : "pages/helpPeople/helpPeople",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom",
+ "onReachBottomDistance": 300
+ }
+ },
+ {
+ "path" : "pages/helpPeople/formTable",
+ "style" :
+ {
+ "navigationBarTitleText" : "信息收集",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom",
+ "onReachBottomDistance": 300
}
}
],
diff --git a/pages/helpPeople/formTable.vue b/pages/helpPeople/formTable.vue
new file mode 100644
index 0000000..2185173
--- /dev/null
+++ b/pages/helpPeople/formTable.vue
@@ -0,0 +1,994 @@
+
+
+
+
+
+
+
+ 户主姓名
+
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+
+
+ 家庭人数
+
+
+
+
+
+
+
+ 家庭地址
+
+
+
+
+
+
+
+
+
+
+ 助民惠农
+
+
+ {{saveNum}}/5
+
+
+
+
+
+
+
+
+
+ 房子出租需求
+
+
+
+
+ 展开
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+ 房子出租需求
+
+
+ 保存
+
+
+
+
+
+ 面积
+
+
+
+
+
+
+
+ 出租年限
+
+
+
+
+
+
+
+ 出租要求
+
+
+
+
+
+
+
+ 主题结构是否完整
+
+
+
+
+
+
+
+ 是否允许装修
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 空闲土地出租需求
+
+
+
+
+ 展开
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+ 空闲土地出租需求
+
+
+ 保存
+
+
+
+
+
+ 是否可以种养
+
+
+
+
+
+
+
+ 面积
+
+
+
+
+
+
+
+ 种养要求
+
+
+
+
+
+
+
+ 租金和支付方式
+
+
+
+
+
+
+
+ 土地优势
+
+
+
+
+
+
+
+ 土地缺点
+
+
+
+
+
+
+
+ 闲置原因
+
+
+
+
+
+
+
+ 使用年限
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 农副产品出售需求
+
+
+
+
+ 展开
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+
+
+ 农副产品出售需求
+
+
+ 保存
+
+
+
+
+
+ 种养类型
+
+
+
+
+
+
+
+ 种养面积
+
+
+
+
+
+
+
+ 土地性质
+
+
+
+
+
+
+
+ 种养方式
+
+
+
+
+
+
+
+ 成熟周期
+
+
+
+
+
+
+
+ 最近成熟时间
+
+
+
+
+
+
+
+ 年产量
+
+
+
+
+
+
+
+ 自己消化/市场销售
+
+
+
+
+
+
+
+ 销售方式
+
+
+
+
+
+
+
+ 年销量
+
+
+
+
+
+
+
+ 产品名称
+
+
+
+
+
+
+
+ 优势
+
+
+
+
+
+
+
+ 产品有无品牌
+
+
+
+
+
+
+
+ 是否进行粗加工
+
+
+
+
+
+
+
+ 产品诉求
+
+
+
+
+
+
+
+ 急需解决的问题
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 空闲资产出租/出售需求
+
+
+
+
+ 展开
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+
+
+ 空闲资产出租/出售需求
+
+
+ 保存
+
+
+
+
+
+ 资产名称
+
+
+
+
+
+
+
+ 资产优势
+
+
+
+
+
+
+
+ 数量
+
+
+
+
+
+
+
+ 增收方式 (出租、出售、置换、捐赠)
+
+
+
+
+
+
+
+ 其他可变现
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 房屋装饰建设
+
+
+
+
+ 展开
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+
+
+ 房屋装饰建设/出售
+
+
+ 保存
+
+
+
+
+
+ 施工地点
+
+
+
+
+
+
+
+ 开始时间
+
+
+
+
+
+
+
+ 修/建标准
+
+
+
+
+
+
+
+ 事主要求
+
+
+
+
+
+
+
+ 房屋建设时长
+
+
+
+
+
+
+
+ 设计服务
+
+
+
+
+
+
+
+
+
+
+ 确认提交
+
+
+
+
+
+
+ {{showText.title}}
+
+
+ {{showText.content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/helpPeople/helpPeople.vue b/pages/helpPeople/helpPeople.vue
new file mode 100644
index 0000000..25869a3
--- /dev/null
+++ b/pages/helpPeople/helpPeople.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+ 我是居民用户
+
+
+
+
+
+ 我是农民用户
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/newActivity/activityDetail/activityDetail.vue b/pages/newActivity/activityDetail/activityDetail.vue
index f7bf497..6067b4e 100644
--- a/pages/newActivity/activityDetail/activityDetail.vue
+++ b/pages/newActivity/activityDetail/activityDetail.vue
@@ -1,6 +1,5 @@
-
@@ -158,7 +157,7 @@
height: 34rpx;
width: 20rpx;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 30rpx;
}
diff --git a/pages/newActivity/giftBag/giftBag.vue b/pages/newActivity/giftBag/giftBag.vue
index 943d5d6..ae603ad 100644
--- a/pages/newActivity/giftBag/giftBag.vue
+++ b/pages/newActivity/giftBag/giftBag.vue
@@ -1,6 +1,5 @@
-
- ¥ {{item.count}}
+
+ ¥ {{item.count}} 现在购买礼包即送
+
+ 数量:
+ -
+ {{item.num}}
+ +
+
+
+
+
+
+ 8%无门槛红包
+
+
+
+ 42%现金抵扣红包
+
+
-
-
-
-
- 当前选择面额 ¥{{nowPrice}}
-
- -
- {{priceCount}}
- +
-
-
-
- 注意事项:
- 充值后金额不能提现，仅可用于商城商品消费
-
@@ -77,26 +78,30 @@
userInfo: {},
curNow: 0,
list1: [{
- name: '余额充值'
+ name: '余额购买'
}, {
- name: '充值记录'
+ name: '购买记录'
}],
changeList: [
{
- count: 100,
- pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item1.webp'
+ count: 0.01, // 面额
+ pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item1.webp',
+ num: 0, //购买的个数
},
{
count: 200,
- pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item2.webp'
+ pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item2.webp',
+ num: 0, //购买的个数
},
{
count: 500,
- pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item3.webp'
+ pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item3.webp',
+ num: 0, //购买的个数
},
{
count: 1000,
- pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item4.webp'
+ pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item4.webp',
+ num: 0, //购买的个数
}
],
nowChange: 0,
@@ -112,7 +117,7 @@
},
otherValue: '其他',
now_money: 0,
- navRecharge: ['账户充值', '佣金转入'],
+ navRecharge: ['账户购买', '佣金转入'],
active: 0,
number: '',
from: '',
@@ -143,7 +148,6 @@
}
},
onLoad() {
- this.nowPrice = this.changeList[0];
if (this.isLogin) {
this.getUserInfo()
} else {
@@ -155,13 +159,18 @@
computed: {
...mapGetters(['isLogin', 'viewColor', 'keyColor']),
total() {
- return this.nowPrice * this.priceCount;
+ return this.changeList.reduce((t, obj)=>{
+ return t + (obj.count * obj.num);
+ }, 0);
}
},
onReachBottom() {
this.getCommissionInfo();
},
methods: {
+ back(){
+ uni.navigateBack();
+ },
clickTab1(e) {
this.curNow = e.index;
if (e.index == 1) {
@@ -175,18 +184,17 @@
this.nowChange = index;
if (this.priceCount * this.nowPrice > 20000) {
this.priceCount = Math.floor(20000 / this.nowPrice);
- return Toast('不可充值超过2万元');
+ return Toast('不可超过2万元');
}
},
- append() {
- if (this.priceCount * this.nowPrice > 20000) {
- this.priceCount = Math.floor(20000 / this.nowPrice);
- return Toast('不可充值超过2万元');
- } else this.priceCount++;
+ append(item) {
+ if (this.total + item.count > 20000 || this.total>=20000) {
+ return Toast('不可超过2万元');
+ } else item.num++;
},
- reduce() {
- if (this.priceCount <= 1) return Toast('最少充值一份');
- else this.priceCount--;
+ reduce(item) {
+ if (this.total==0||item.num==0) return Toast('不能再少啦');
+ else item.num--;
},
getCommissionInfo() {
getCommissionInfo(this.where).then((res) => {
@@ -213,7 +221,7 @@
}
},
/**
- * 充值额度选择
+ * 购买额度选择
*/
getRecharge() {
getRechargeApi()
@@ -260,7 +268,7 @@
},
/*
- * 用户充值
+ * 用户购买
*/
submitSub: function(e) {
let that = this
@@ -308,12 +316,12 @@
if (this.rechar_id == 0) {
if (parseFloat(that.total) === 0) {
return that.$util.Tips({
- title: '充值金额金额不能为0！'
+ title: '购买金额金额不能为0！'
});
}
if (!that.total) {
return that.$util.Tips({
- title: '请填写充值金额！'
+ title: '请填写购买金额！'
});
}
if (!Number(that.total)) {
@@ -614,7 +622,7 @@
padding-bottom: 300rpx;
.bg_box{
- height: 520rpx;
+ height: 486rpx;
position: relative;
overflow: hidden;
.bg_img {
@@ -639,7 +647,7 @@
height: 34rpx;
width: 20rpx;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 30rpx;
}
@@ -674,16 +682,77 @@
}
.item_content{
+ padding: 26rpx;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .top{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 70rpx;
+ .top_left{
+ font-size: 58rpx;
+ color: #ffc53d;
+ display: flex;
+ align-content: center;
+ .tips{
+ font-size: 24rpx;
+ border: 5rpx solid #ffc53d;
+ margin-left: 20rpx;
+ padding: 5rpx 15rpx;
+ border-radius: 60rpx;
+ color: #7C5906;
+ }
+ .c_content{
+ padding-top: 10rpx;
+ }
+ .c_icon {
+ padding-top: 15rpx;
+ font-size: 36rpx;
+ }
+ }
+ .top_right{
+ display: flex;
+ align-items: center;
+ color: #FF3A32;
+ text{
+ font-size: 28rpx;
+ }
+ view{
+ height: 60rpx;
+ width: 40rpx;
+ text-align: center;
+ line-height: 60rpx;
+ }
+ }
+ }
+ .bottom{
+ font-size: 28rpx;
+ display: flex;
+ align-items: center;
+ color: #FF3A32;
+ .bottom_item{
+ flex: 1;
+ display: flex;
+ align-items: center;
+ image{
+ width: 32rpx;
+ height: 40rpx;
+ }
+ .text{
+ padding-left: 15rpx;
+ }
+ }
+ }
}
- .c_icon {
- font-size: 28rpx;
- }
}
.change_item_active {
@@ -693,82 +762,8 @@
}
}
- .change_count {
- width: 700rpx;
- margin: 0 auto;
- border-radius: 20rpx;
- border: 5rpx solid #FF8056;
- color: #FF8056;
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding-left: 30rpx;
- margin-top: 30rpx;
- margin-bottom: 50rpx;
-
- .c_btn {
- display: flex;
-
- view {
- height: 80rpx;
- width: 60rpx;
- text-align: center;
- line-height: 80rpx;
- }
- }
- }
-
- .c_tips {
- width: 700rpx;
- margin: 0 auto;
- font-size: 26rpx;
- color: #616161;
- padding-bottom: 30rpx;
-
- .tips_title {
- font-size: 30rpx;
- }
- }
}
- .card2 {
- background-color: #fff;
-
- .record {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 26rpx 20rpx;
- border-bottom: 1rpx solid #f7f7f7;
-
- .left {
- display: flex;
-
- image {
- height: 76rpx;
- width: 76rpx;
- margin-right: 20rpx;
- }
-
- .tips {
- font-size: 26rpx;
- color: #616161;
- }
- }
-
- .right {
- font-size: 36rpx;
- }
- }
-
- .no_data {
- padding: 60rpx 0;
- text-align: center;
- border-top: 1rpx solid #f7f7f7;
- color: #999;
- font-size: 26rpx;
- }
- }
}
diff --git a/pages/newActivity/invitation/invitation.vue b/pages/newActivity/invitation/invitation.vue
index bf872e5..d04183b 100644
--- a/pages/newActivity/invitation/invitation.vue
+++ b/pages/newActivity/invitation/invitation.vue
@@ -1,6 +1,5 @@
-
@@ -186,7 +185,7 @@ page{
height: 34rpx;
width: 20rpx;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 30rpx;
}
.bg_body{
diff --git a/pages/newActivity/subsidy/subsidy2.vue b/pages/newActivity/subsidy/subsidy2.vue
index 0605f5f..1d7599a 100644
--- a/pages/newActivity/subsidy/subsidy2.vue
+++ b/pages/newActivity/subsidy/subsidy2.vue
@@ -1,6 +1,5 @@
-
@@ -84,7 +83,7 @@ page{
height: 34rpx;
width: 20rpx;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 30rpx;
}
.bg_title{
@@ -92,7 +91,7 @@ page{
color: #fff;
font-weight: 500;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 50%;
transform: translate(-50%);
}
diff --git a/pages/newActivity/subsidy/subsidy3.vue b/pages/newActivity/subsidy/subsidy3.vue
index 965579d..191f934 100644
--- a/pages/newActivity/subsidy/subsidy3.vue
+++ b/pages/newActivity/subsidy/subsidy3.vue
@@ -1,6 +1,5 @@
-
@@ -84,7 +83,7 @@ page{
height: 34rpx;
width: 20rpx;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 30rpx;
}
.bg_title{
@@ -92,7 +91,7 @@ page{
color: #fff;
font-weight: 500;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 50%;
transform: translate(-50%);
}
diff --git a/pages/newActivity/towPrice/towPrice.vue b/pages/newActivity/towPrice/towPrice.vue
index f85612d..1cf2228 100644
--- a/pages/newActivity/towPrice/towPrice.vue
+++ b/pages/newActivity/towPrice/towPrice.vue
@@ -1,6 +1,5 @@
-
@@ -218,7 +217,7 @@
height: 34rpx;
width: 20rpx;
position: absolute;
- top: 30rpx;
+ top: calc(var(--status-bar-height) + 30rpx);
left: 30rpx;
}
diff --git a/pages/redpacket/redpack_type.vue b/pages/redpacket/redpack_type.vue
index cbb8955..9bf33bb 100644
--- a/pages/redpacket/redpack_type.vue
+++ b/pages/redpacket/redpack_type.vue
@@ -1,8 +1,13 @@
-
-
-
+
+
+
+
+
+
+ 红包余额
+
@@ -21,6 +26,7 @@
+
@@ -45,6 +51,9 @@
this.list = res.data;
})
},
+ back(){
+ uni.navigateBack();
+ },
navgo(item){
if(item.type==1) uni.navigateTo({
url: '/pages/newActivity/subsidy/subsidy2'
@@ -72,25 +81,48 @@