diff --git a/app.json b/app.json
index 18b1eab..2169b25 100644
--- a/app.json
+++ b/app.json
@@ -1,19 +1,20 @@
{
"pages": [
- "pages/index/index",
+ "pages/logain/logain",
"pages/logs/logs",
"pages/jiedan/jiedan",
"pages/mypage/mypage",
"pages/shop/shop",
"pages/find/find",
- "pages/logain/logain",
"pages/zucepage/zucepage",
"pages/wangjimima/wangjimima",
"pages/xiangqing/xiangqing",
"pages/woyaojiedan/woyaojiedan",
"pages/mingxi/mingxi",
"pages/findxiangqing/findxiangqing",
- "pages/wodetuandui/wodetuandui"
+ "pages/wodetuandui/wodetuandui",
+ "pages/wodejiedan/wodejiedan",
+ "pages/index/index"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/app.wxss b/app.wxss
index cc59e77..0276508 100644
--- a/app.wxss
+++ b/app.wxss
@@ -25,6 +25,7 @@ text {
.flex-row {
display: flex;
flex-direction: row;
+
}
.flex-col {
diff --git a/image/16d828b713b2f70f899c4e678516576a.png b/image/16d828b713b2f70f899c4e678516576a.png
new file mode 100644
index 0000000..c7cde81
Binary files /dev/null and b/image/16d828b713b2f70f899c4e678516576a.png differ
diff --git a/image/17470264949353830750.png b/image/17470264949353830750.png
new file mode 100644
index 0000000..0436b17
Binary files /dev/null and b/image/17470264949353830750.png differ
diff --git a/image/1a3b2db58d7a4912e97e11e769fc1dc5.png b/image/1a3b2db58d7a4912e97e11e769fc1dc5.png
new file mode 100644
index 0000000..6a10adc
Binary files /dev/null and b/image/1a3b2db58d7a4912e97e11e769fc1dc5.png differ
diff --git a/image/39edc99781511ab686d6b07290b376d1.png b/image/39edc99781511ab686d6b07290b376d1.png
new file mode 100644
index 0000000..73796cf
Binary files /dev/null and b/image/39edc99781511ab686d6b07290b376d1.png differ
diff --git a/image/4875fbdc868788e873dd606d7418f411.png b/image/4875fbdc868788e873dd606d7418f411.png
new file mode 100644
index 0000000..a483b05
Binary files /dev/null and b/image/4875fbdc868788e873dd606d7418f411.png differ
diff --git a/image/4ec3ad48669184342e84e3641589c19b.png b/image/4ec3ad48669184342e84e3641589c19b.png
new file mode 100644
index 0000000..5c6c9ba
Binary files /dev/null and b/image/4ec3ad48669184342e84e3641589c19b.png differ
diff --git a/image/5f908d0a671b5ec6d57fcee228fce66c.png b/image/5f908d0a671b5ec6d57fcee228fce66c.png
new file mode 100644
index 0000000..fcc7d31
Binary files /dev/null and b/image/5f908d0a671b5ec6d57fcee228fce66c.png differ
diff --git a/image/79a346c585f09dd9cb9b756a45228b43.png b/image/79a346c585f09dd9cb9b756a45228b43.png
new file mode 100644
index 0000000..b99920a
Binary files /dev/null and b/image/79a346c585f09dd9cb9b756a45228b43.png differ
diff --git a/image/8617e68f608192d2da284bfdab6b4c87.png b/image/8617e68f608192d2da284bfdab6b4c87.png
new file mode 100644
index 0000000..4e16193
Binary files /dev/null and b/image/8617e68f608192d2da284bfdab6b4c87.png differ
diff --git a/image/8682072f44b5fb0dd83dc3187bf32f2d.png b/image/8682072f44b5fb0dd83dc3187bf32f2d.png
new file mode 100644
index 0000000..887e09a
Binary files /dev/null and b/image/8682072f44b5fb0dd83dc3187bf32f2d.png differ
diff --git a/image/8d2a546eff17d0f8759f0f3ea91c47bf.png b/image/8d2a546eff17d0f8759f0f3ea91c47bf.png
new file mode 100644
index 0000000..72a4157
Binary files /dev/null and b/image/8d2a546eff17d0f8759f0f3ea91c47bf.png differ
diff --git a/image/c432ff17b41f470760ae10d3069e91bf.png b/image/c432ff17b41f470760ae10d3069e91bf.png
new file mode 100644
index 0000000..3e5541d
Binary files /dev/null and b/image/c432ff17b41f470760ae10d3069e91bf.png differ
diff --git a/image/erweima.png b/image/erweima.png
new file mode 100644
index 0000000..b73b6b8
Binary files /dev/null and b/image/erweima.png differ
diff --git a/pages/jiedan/jiedan.js b/pages/jiedan/jiedan.js
index 82ca1a1..2882cc4 100644
--- a/pages/jiedan/jiedan.js
+++ b/pages/jiedan/jiedan.js
@@ -40,26 +40,42 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
- const that =this
- wx.request({
- url: url + '/project/query/card',
- method: 'POST',
- data: {
-
- },
- header: {
- 'content-type': 'application/json'
- },
+ const that = this
+ wx.getStorage({
+ key: "logmessage",
success(res) {
- console.log('查询成功', res);
- that.setData({
- list:res.data.data
- })
- },
- fail(err) {
- console.error('请求失败', err);
+ const userinfo = res.data.Authorization
+ wx.request({
+ url: url + '/project/query/card',
+ method: 'POST',
+ data: {
+
+ },
+ header: {
+ 'content-type': 'application/json',
+ 'Authorization': userinfo
+ },
+ success(res) {
+ console.log('查询成功', res);
+ if(res.data.code==1){
+ that.setData({
+ list:res.data.data
+ })
+ }else{
+ wx.showToast({
+ title: res.data.message,
+ icon:'error',
+ duration:2000
+ })
+ }
+ },
+ fail(err) {
+ console.error('请求失败', err);
+ }
+ });
}
- });
+ })
+
},
/**
diff --git a/pages/jiedan/jiedan.wxml b/pages/jiedan/jiedan.wxml
index 169a1d9..ccd938e 100644
--- a/pages/jiedan/jiedan.wxml
+++ b/pages/jiedan/jiedan.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/logain/logain.js b/pages/logain/logain.js
index 2cdbcc4..208d5ad 100644
--- a/pages/logain/logain.js
+++ b/pages/logain/logain.js
@@ -72,6 +72,7 @@ submit(){
const that = this
const phone = this.data.inputValue;
const password = this.data.inputValuepassword;
+ console.log(password,'isdjidasjiodaso');
// 手机号验证（6~11位数字）
if (!/^\d{6,11}$/.test(phone)) {
wx.showToast({
@@ -82,9 +83,9 @@ submit(){
}
// 密码验证（6~10位字符）
- if (!/^.{6,10}$/.test(password)) {
+ if (!/^[a-zA-Z0-9]{6,10}$/.test(password)) {
wx.showToast({
- title: '请输入6到10位的密码',
+ title: '请输入6到10位密码',
icon: 'none'
});
return;
@@ -106,11 +107,12 @@ submit(){
userPassword: this.data.inputValuepassword
},
header: {
- 'content-type': 'application/json'
+ 'content-type': 'application/json',
},
success(res) {
console.log('登录成功', res);
if(res.data.code==1){
+ console.log(res.data.data,'zhehsidata');
wx.showToast({
title: '登录成功',
icon: 'success',
@@ -168,7 +170,7 @@ getcode(){
templateString: this.data.yanzhengphone
},
header: {
- 'content-type': 'application/json'
+ 'content-type': 'application/json',
},
success(res) {
console.log('发送成功', res);
@@ -218,7 +220,7 @@ submityanzhengma(){
verificationCode: this.data.yanzhengcode
},
header: {
- 'content-type': 'application/json'
+ 'content-type': 'application/json',
},
success(res) {
console.log('登录成功', res);
@@ -257,12 +259,14 @@ submityanzhengma(){
});
},
setmessage() {
+ console.log("diaoyongle ");
const that = this;
wx.getStorage({
key: "logmessage",
success(res) {
console.log(res.data, 'sajlkdlasjdkl');
const userinfo = res.data;
+ console.log(userinfo,'这是获取的');
wx.request({
url: url + '/userInfo/get/jwt',
method: 'GET',
diff --git a/pages/logain/logain.wxml b/pages/logain/logain.wxml
index 421fd61..f800c74 100644
--- a/pages/logain/logain.wxml
+++ b/pages/logain/logain.wxml
@@ -5,7 +5,7 @@
- 密码登录
验证码登录
diff --git a/pages/logain/logain.wxss b/pages/logain/logain.wxss
index 6a7855d..77fc377 100644
--- a/pages/logain/logain.wxss
+++ b/pages/logain/logain.wxss
@@ -5,7 +5,7 @@
margin-top: 40.38rpx;
}
.page {
- padding: 121.15rpx 42.31rpx 440.48rpx 44.23rpx;
+ padding: 121.15rpx 42.31rpx 180.48rpx 44.23rpx;
background-color: #ffffff;
width: 100%;
overflow-y: hidden;
@@ -59,13 +59,14 @@
margin-left: 35.75rpx;
}
.font_4 {
- font-size: 26.92rpx;
+ font-size: 30.92rpx;
font-family: SourceHanSansCN;
color: #808080;
}
.text_1 {
line-height: 24.85rpx;
width: 590rpx;
+ height: 20px;
}
.section {
padding: 37.27rpx 16.25rpx 35.79rpx 35.75rpx;
diff --git a/pages/mypage/mypage.js b/pages/mypage/mypage.js
index fbc231a..9ac1ccf 100644
--- a/pages/mypage/mypage.js
+++ b/pages/mypage/mypage.js
@@ -1,4 +1,4 @@
-// pages/mypage/mypage.js
+
Page({
@@ -19,6 +19,7 @@ Page({
},
onShow() {
+ console.log("askjda");
const that = this
wx.getStorage({
key: "usermessage",
@@ -34,7 +35,11 @@ Page({
}
})
},
-
+ wodejiedan(){
+ wx.navigateTo({
+ url: '/pages/wodejiedan/wodejiedan',
+ })
+ },
onHide() {
},
diff --git a/pages/mypage/mypage.wxml b/pages/mypage/mypage.wxml
index 1cda906..26941d4 100644
--- a/pages/mypage/mypage.wxml
+++ b/pages/mypage/mypage.wxml
@@ -34,7 +34,7 @@
立即提现
@@ -58,21 +58,21 @@
资金明细
提现账户
提现记录
@@ -82,28 +82,29 @@
我的课程
-
+
我的接单
勤工俭学
购物订单
@@ -113,40 +114,41 @@
账号设置
佣金设置
我的团队
项目
diff --git a/pages/wangjimima/wangjimima.wxss b/pages/wangjimima/wangjimima.wxss
index 781be08..6a34085 100644
--- a/pages/wangjimima/wangjimima.wxss
+++ b/pages/wangjimima/wangjimima.wxss
@@ -23,7 +23,7 @@
padding: 42.96rpx 0 42.96rpx;
}
.text-wrapper_1 {
- padding: 35.46rpx 0 37.77rpx;
+ padding: 25.46rpx 0 27.77rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -45,7 +45,7 @@
line-height: 24.85rpx;
}
.section {
- padding: 37.27rpx 20.1rpx 35.79rpx 31.9rpx;
+ padding: 27.27rpx 20.1rpx 25.79rpx 25.9rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -56,12 +56,12 @@
color: #d43030;
}
.text-wrapper_2 {
- padding: 35.27rpx 0 37.79rpx;
+ padding: 25.27rpx 0 27.79rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
.text-wrapper_4 {
- padding: 37.19rpx 0 35.73rpx;
+ padding: 27.19rpx 0 25.73rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
diff --git a/pages/wodejiedan/wodejiedan.js b/pages/wodejiedan/wodejiedan.js
new file mode 100644
index 0000000..85fcd4d
--- /dev/null
+++ b/pages/wodejiedan/wodejiedan.js
@@ -0,0 +1,86 @@
+import {url} from '../../request'
+Page({
+ data: {
+ items: [null, null, null,null],
+ },
+ onLoad(options) {
+
+ },
+ onReady() {
+
+ },
+ onShow() {
+ const that = this
+ wx.getStorage({
+ key: "logmessage",
+ success(res) {
+ const userinfo = res.data.Authorization
+ wx.request({
+ url: url + '/project/get/running',
+ method: 'POST',
+ data: {
+
+ },
+ header: {
+ 'content-type': 'application/json',
+ 'Authorization': userinfo
+ },
+ success(res) {
+ console.log('登录成功', res);
+ if(res.data.code==1){
+ that.setData({
+ list:res.data.data
+ })
+ wx.showToast({
+ title: '查询成功',
+ icon: 'success',
+ duration: 2000
+ });
+ }else{
+ wx.showToast({
+ title: res.data.message,
+ icon:"error",
+ duration:2000
+ })
+ }
+ },
+ fail(err) {
+ console.error('请求失败', err);
+ }
+ });
+ }
+ })
+
+ },
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/wodejiedan/wodejiedan.json b/pages/wodejiedan/wodejiedan.json
new file mode 100644
index 0000000..0e892df
--- /dev/null
+++ b/pages/wodejiedan/wodejiedan.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "项目",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/wodejiedan/wodejiedan.wxml b/pages/wodejiedan/wodejiedan.wxml
new file mode 100644
index 0000000..78e7508
--- /dev/null
+++ b/pages/wodejiedan/wodejiedan.wxml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+ {{item.projectName}}
+ 结算周期T+{{item.projectSettlementCycle}} 实时数据
+
+
+
+
+
+
+ 推广码
+
+
+
+ 结算明细
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/wodejiedan/wodejiedan.wxss b/pages/wodejiedan/wodejiedan.wxss
new file mode 100644
index 0000000..0030fce
--- /dev/null
+++ b/pages/wodejiedan/wodejiedan.wxss
@@ -0,0 +1,122 @@
+.ml-126 {
+ margin-left: 242.31rpx;
+}
+.mt-9 {
+ margin-top: 17.31rpx;
+}
+.mt-25 {
+ margin-top: 48.08rpx;
+}
+.ml-5 {
+ margin-left: 9.62rpx;
+}
+.ml-11 {
+ margin-left: 21.15rpx;
+}
+.page {
+ padding-bottom: 871.15rpx;
+ background-color: #ffffff;
+ height: 100%;
+ width: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+.section {
+ padding: 44.23rpx 0 373.08rpx;
+ background-image: linear-gradient(180deg, #ff8d1a -34.1%, #ffffff1a 134.1%);
+}
+.group {
+ margin-left: 48.08rpx;
+}
+.image {
+ width: 15.38rpx;
+ height: 23.08rpx;
+}
+.font {
+ font-size: 25rpx;
+ font-family: SourceHanSansCN;
+ line-height: 23.13rpx;
+ color: #000000;
+}
+.text {
+ color: #ffffff;
+ font-size: 26.92rpx;
+ line-height: 23.56rpx;
+}
+.list {
+ margin-top: -298.08rpx;
+ padding: 0 44.23rpx;
+}
+.list-item {
+ padding: 38.46rpx 19.23rpx 11.54rpx 38.46rpx;
+ background-color: #ffffff;
+ border-radius: 14.58rpx;
+ box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
+}
+.list-item:first-child {
+ margin-top: 0;
+}
+.image_2 {
+ width: 103.85rpx;
+ height: 103.85rpx;
+}
+.group_2 {
+ margin-top: 7.69rpx;
+ width: 142.31rpx;
+}
+.font_2 {
+ font-size: 19.23rpx;
+ font-family: SourceHanSansCN;
+ line-height: 23.13rpx;
+ color: #808080;
+}
+.text_2 {
+ line-height: 23.08rpx;
+}
+.group_3 {
+ margin-top: 11.54rpx;
+}
+.image_3 {
+ margin-right: 23.08rpx;
+ width: 23.08rpx;
+ height: 26.92rpx;
+}
+.section_2 {
+ padding: 7.69rpx 15.38rpx 3.85rpx;
+ background-color: #ffffff;
+ border-radius: 9.62rpx;
+ width: 142.31rpx;
+ height: 42.31rpx;
+ border-left: solid 1.92rpx #ff8d1a;
+ border-right: solid 1.92rpx #ff8d1a;
+ border-top: solid 1.92rpx #ff8d1a;
+ border-bottom: solid 1.92rpx #ff8d1a;
+}
+.image_5 {
+ width: 25rpx;
+ height: 25rpx;
+}
+.font_3 {
+ font-size: 19.23rpx;
+ font-family: SourceHanSansCN;
+ line-height: 17.92rpx;
+ color: #ff8d1a;
+}
+.text_3 {
+ line-height: 17.9rpx;
+}
+.section_3 {
+ padding: 3.85rpx 0;
+ background-color: #ffffff;
+ border-radius: 9.62rpx;
+ width: 142.31rpx;
+ height: 42.31rpx;
+ border-left: solid 1.92rpx #ff8d1a;
+ border-right: solid 1.92rpx #ff8d1a;
+ border-top: solid 1.92rpx #ff8d1a;
+ border-bottom: solid 1.92rpx #ff8d1a;
+}
+.image_4 {
+ width: 48.08rpx;
+ height: 36.54rpx;
+}
\ No newline at end of file
diff --git a/pages/woyaojiedan/woyaojiedan.js b/pages/woyaojiedan/woyaojiedan.js
index 36e75e5..63bf1c1 100644
--- a/pages/woyaojiedan/woyaojiedan.js
+++ b/pages/woyaojiedan/woyaojiedan.js
@@ -1,66 +1,66 @@
-// pages/woyaojiedan/woyaojiedan.js
+import {url} from '../../request'
Page({
-
- /**
- * 页面的初始数据
- */
data: {
},
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
+ onLoad(options){
+ const id = options.id
+ this.setData({
+ id:id
+ })
},
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
+ name(e){
+ this.setData({
+ name:e.detail.value
+ })
+ console.log(e.detail.value);
},
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
+ phone(e){
+ this.setData({
+ phone:e.detail.value
+ })
+ console.log(e.detail.value);
},
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
+ submit(){
+ const that = this
+ wx.getStorage({
+ key: "logmessage",
+ success(res) {
+ const userinfo = res.data.Authorization
+ wx.request({
+ url: url + '/promoCodeApply/apply',
+ method: 'POST',
+ data: {
+ "salespersonName": that.data.name,
+ "salespersonPhone": that.data.phone,
+ "projectId": that.data.id
+ },
+ header: {
+ 'content-type': 'application/json',
+ 'Authorization': userinfo
+ },
+ success(res) {
+ console.log('提交成功', res);
+ if(res.data.code==1){
+ wx.showToast({
+ title: res.data.message,
+ icon: 'sucess',
+ duration: 2000
+ })
+ }else{
+ wx.showToast({
+ title: res.data.message,
+ icon: 'error',
+ duration: 2000
+ })
+ }
+ },
+ fail(err) {
+ console.error('请求失败', err);
+ }
+ });
+ }
+ })
+
},
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/woyaojiedan/woyaojiedan.wxml b/pages/woyaojiedan/woyaojiedan.wxml
index 962c2c9..2df5dcd 100644
--- a/pages/woyaojiedan/woyaojiedan.wxml
+++ b/pages/woyaojiedan/woyaojiedan.wxml
@@ -2,12 +2,12 @@
姓名
-
+
手机号
-
+
-
+
申请资料报备
\ No newline at end of file
diff --git a/pages/xiangqing/xiangqing.js b/pages/xiangqing/xiangqing.js
index 6f06c1e..2007184 100644
--- a/pages/xiangqing/xiangqing.js
+++ b/pages/xiangqing/xiangqing.js
@@ -5,16 +5,28 @@ Page({
* 页面的初始数据
*/
data: {
- projectImage:""
+ projectImage:"",
+ selected: 'detail',
+ show:false,
+ promoCodeApplyVOList:[]
},
/**
* 生命周期函数--监听页面加载
*/
+ onSelect(e) {
+ const key = e.currentTarget.dataset.key;
+ console.log(key,'dianjile');
+ this.setData({
+ selected: key
+ });
+ },
jiedan(){
+ const id = this.data.id
wx.navigateTo({
- url: '/pages/woyaojiedan/woyaojiedan',
+ url: `/pages/woyaojiedan/woyaojiedan?id=${id}`,
})
+ console.log(id);
},
mingxi(){
wx.navigateTo({
@@ -24,84 +36,51 @@ Page({
onLoad(options) {
const that = this
const id = options.id
- wx.request({
- url: url + '/project/query/id',
- method: 'POST',
- data: {
- "id": id
- },
- header: {
- 'content-type': 'application/json'
- },
+ wx.getStorage({
+ key: "logmessage",
success(res) {
- console.log('查询成功', res);
- if(res.data.code==1){
- const defalt = res.data.data
-
- that.setData({
- projectDesc:defalt.projectDesc,
- projectDescription:defalt.projectDescription,
- projectFlow:defalt.projectFlow,
- projectImage:defalt.projectImage,
- projectName:defalt.projectName,
- projectStatus:defalt.projectStatus,
- settlementDesc:defalt.settlementDesc,
- projectPrice:defalt.projectPrice,
- })
- }
- },
- fail(err) {
- console.error('请求失败', err);
+ const userinfo = res.data.Authorization
+ wx.request({
+ url: url + '/project/query/id',
+ method: 'POST',
+ data: {
+ "id": id
+ },
+ header: {
+ 'content-type': 'application/json',
+ 'Authorization': userinfo
+ },
+ success(res) {
+ console.log('查询成功', res);
+ if(res.data.code==1){
+ const defalt = res.data.data
+ that.setData({
+ id:defalt.id,
+ projectDesc:defalt.projectDesc,
+ projectDescription:defalt.projectDescription,
+ projectFlow:defalt.projectFlow,
+ projectImage:defalt.projectImage,
+ projectName:defalt.projectName,
+ projectStatus:defalt.projectStatus,
+ settlementDesc:defalt.settlementDesc,
+ projectPrice:defalt.projectPrice,
+ promoCodeApplyVOList:defalt.promoCodeApplyVOList
+ })
+ console.log(that.data.promoCodeApplyVOList,'hhhhhh');
+ }
+ },
+ fail(err) {
+ console.error('请求失败', err);
+ }
+ });
}
- });
+ })
+
},
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
+ back(){
+ wx.navigateBack({
+ delta: 1
+ })
}
+
})
\ No newline at end of file
diff --git a/pages/xiangqing/xiangqing.wxml b/pages/xiangqing/xiangqing.wxml
index b507210..d2c8c61 100644
--- a/pages/xiangqing/xiangqing.wxml
+++ b/pages/xiangqing/xiangqing.wxml
@@ -23,81 +23,79 @@
- 项目详情
- 我的推广码
+
+ 项目详情
+
-
-
-
-
-
-
- 项目政策
+
+ 我的推广码
+
+
+
+
+
+
- 结算说明
- 新增推广码→填写信息→开码记录查看推广码
-
-
-
+ 结算说明：
+
+
+
- 项目说明
-
- 1.此业务需要用户扫描二维码/通过小程序链接跳转至小程序购买；
-
- 2.必须通过我们链接/二维码购买才能统计数据，例如：用户第二次直接在小程序/APP购买，那么第二次购买的就不能算作结算数据。
-
-
- 推广口令 报备流程（口令有效期一个月） 应各位合伙人要求，开通美团 外卖省钱包-春季活动 口令推广申请权限
-
-
-
- 开头口令推广权限注意点： 1:先正常申请一个省钱包的推广sid，后扫下方二维码报备。
- 2:注意查看报备结果，审核通过后可使用 3:注意口令有效期，为申请开始的一个月有效，到期后重新申请。
- 4:每天16：00前申请的，次日12点查看结果。每天16:00后申请的。次日19点查看结果
-
+ 项目说明：
+
- 项目流程
-
-
-
-
-
-
-
-
+ 项目流程：
+
-
+
再想想
- 我要接单
+ 申请推广码
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+ 审核通过
+
+
+
+
+ {{item.salespersonName}}
+ {{item.salespersonPhone}}
+
+
+ 任务名称：{{item.projectName}}
+
+
+
+ 结算明细
+
+
+
+
+
+ 查看推广码
+
diff --git a/pages/xiangqing/xiangqing.wxss b/pages/xiangqing/xiangqing.wxss
index 4bc28d5..237f878 100644
--- a/pages/xiangqing/xiangqing.wxss
+++ b/pages/xiangqing/xiangqing.wxss
@@ -155,6 +155,9 @@
margin-left: 34.62rpx;
line-height: 23.52rpx;
}
+.text_100 {
+ line-height: 23.52rpx;
+}
.font_4 {
font-size: 23.08rpx;
font-family: SourceHanSansCN;
@@ -181,7 +184,7 @@
border-radius: 19.23rpx;
}
.text_12 {
- margin-left: 38.46rpx;
+ margin-left: 0.46rpx;
}
.group_7 {
margin-top: 23.08rpx;
@@ -199,7 +202,7 @@
border-radius: 30.81rpx;
}
.text_15 {
- margin-left: 19.23rpx;
+
line-height: 22.88rpx;
}
.image_5 {
@@ -236,4 +239,73 @@
}
.text_17 {
line-height: 28.37rpx;
+}
+.active {
+ color: #ff8d1a;
+}
+.box{
+ width: 100%;
+ height: 100%;
+ margin-top: 50rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+.imagesize{
+ width: 300px;
+ height: 300px;
+}
+.color{
+ color: #ff8d1a;
+ font-size: 16px;
+}
+.mabox{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+}
+.messagebox{
+ width: 90%;
+ height: 200px;
+ border-radius: 20px;
+ border: 1px #a09d9d solid;
+ margin-top: 20rpx;
+}
+.title{
+ width: 100%;
+ height: 30%;
+ background-color: #ff8d1a;
+ border-radius: 20px 20px 0 0;
+ display: flex;
+ align-items: center;
+}
+.erweima{
+ width: 100%;
+ height: 70%;
+ display: flex;
+}
+.zuobox{
+ width: 60%;
+ height: 100%;
+}
+.jiexuan{
+ width: 100%;
+ height: 40px;
+ padding: 10px;
+}
+.youbox{
+ width: 40%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+}
+.imagesize1{
+ width: 100px;
+ height: 100px;
}
\ No newline at end of file
diff --git a/pages/zucepage/zucepage.wxml b/pages/zucepage/zucepage.wxml
index fdbc7a6..eae2a3b 100644
--- a/pages/zucepage/zucepage.wxml
+++ b/pages/zucepage/zucepage.wxml
@@ -1,6 +1,6 @@
-
+
欢迎登陆—青橙校园
diff --git a/pages/zucepage/zucepage.wxss b/pages/zucepage/zucepage.wxss
index c352857..51a692f 100644
--- a/pages/zucepage/zucepage.wxss
+++ b/pages/zucepage/zucepage.wxss
@@ -5,10 +5,11 @@
padding: 30.77rpx 42.31rpx 71.27rpx 44.23rpx;
background-color: #ffffff;
width: 100%;
- overflow-y: auto;
+ overflow-y: hidden;
overflow-x: hidden;
- height: 100%;
+ height: 100vh;
}
+
.text-wrapper {
background-size: 100% 100%;
background-repeat: no-repeat;
@@ -37,7 +38,7 @@
line-height: 25.04rpx;
}
.text-wrapper_2 {
- padding: 35.46rpx 0 37.73rpx;
+ padding: 25.46rpx 0 25.73rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -55,7 +56,7 @@
}
.view {
margin-top: 40.38rpx;
- padding: 37.38rpx 0 35.85rpx;
+ padding: 25.38rpx 0 25.85rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -65,7 +66,7 @@
}
.section {
margin-top: 32.69rpx;
- padding: 35.35rpx 27.79rpx 37.71rpx 35.75rpx;
+ padding: 27.35rpx 27.79rpx 27.71rpx 27.75rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -78,7 +79,7 @@
}
.view_2 {
margin-top: 40.38rpx;
- padding: 37.38rpx 0 35.87rpx;
+ padding: 27.38rpx 0 25.87rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -88,7 +89,7 @@
}
.view_3 {
margin-top: 26.92rpx;
- padding: 37.19rpx 0 35.77rpx;
+ padding: 27.19rpx 0 25.77rpx;
background-color: #ffffff;
box-shadow: 0rpx 3.85rpx 7.69rpx #00000040;
}
@@ -143,4 +144,8 @@
.text_14 {
color: #ff5733;
line-height: 21.31rpx;
+}
+.imagesize{
+ width: 150px;
+ height: 150px;
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 8fad851..88cd79a 100644
--- a/project.config.json
+++ b/project.config.json
@@ -17,12 +17,13 @@
"ignore": [],
"disablePlugins": [],
"outputPath": ""
- }
+ },
+ "condition": false
},
"condition": {},
"editorSetting": {
"tabIndent": "auto",
"tabSize": 2
},
- "appid": "wxc8a6a6a076b37247"
+ "appid": "wx3f968a09e31d6bed"
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 14f28f0..1f002a9 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -3,14 +3,15 @@
"projectname": "qingcheng",
"setting": {
"compileHotReLoad": true,
- "urlCheck": false
+ "urlCheck": false,
+ "bigPackageSizeSupport": false
},
"condition": {
"miniprogram": {
"list": [
{
"name": "pages/xiangqing/xiangqing",
- "pathName": "pages/logain/logain",
+ "pathName": "pages/wodejiedan/wodejiedan",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/request.js b/request.js
index d60944f..015f335 100644
--- a/request.js
+++ b/request.js
@@ -1 +1 @@
-export const url='http://localhost:3456';
+export const url='http://1.94.237.210:3456';