diff --git a/App.vue b/App.vue
index a0bfe21..b949e04 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,6 @@
diff --git a/components/user-agreement/user-agreement.vue b/components/user-agreement/user-agreement.vue
index d1f8803..635b4b8 100644
--- a/components/user-agreement/user-agreement.vue
+++ b/components/user-agreement/user-agreement.vue
@@ -6,6 +6,7 @@
《用户服务协议》和
《隐私政策》,
勾选代表您已同意此协议
+
@@ -30,17 +31,25 @@ export default {
// 服务协议
serviceAgreement(){
- uni.navigateTo({
- url: '/pages/service-agreement/service-agreement',
+ console.log('用户服务协议')
+ uni.navigateToMiniProgram({
+ appId: 'wx5b97b0686831c076',
+ path: 'pages/preview/preview?sid=&fid=60774991254',
+ success(res) {
+ console.log(res);
+ },
});
},
// 隐私政策
privacyAolicy(){
- uni.navigateTo({
- url: '/pages/privacy-aolicy/privacy-aolicy',
+ uni.navigateToMiniProgram({
+ appId: 'wx5b97b0686831c076',
+ path: 'pages/preview/preview?sid=&fid=60774976650',
+ success(res) {
+ console.log(res);
+ },
});
-
}
},
};
diff --git a/manifest.json b/manifest.json
index e81bf4b..d35ad5c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -69,7 +69,8 @@
"desc": "你的位置信息将用于获取地理位置及地图展示"
}
},
- "usingComponents" : true
+ "usingComponents" : true,
+ "navigateToMiniProgramAppIdList": ["wx5b97b0686831c076"]
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages.json b/pages.json
index c2bccb0..5fe768c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,12 @@
{
"pages": [
+ // {
+ // "path": "pages/my-trips/my-trips",
+ // "style": {
+ // "navigationBarTitleText": "我的行程"
+ // }
+ // },
+
{
"path": "pages/index/index",
"style": {
diff --git a/pages/add-stroke/add-stroke.vue b/pages/add-stroke/add-stroke.vue
index a1caf1b..861b6c2 100644
--- a/pages/add-stroke/add-stroke.vue
+++ b/pages/add-stroke/add-stroke.vue
@@ -9,13 +9,26 @@
*抵达时间
+
+ *行程类型
+
+
+
+
+
+
+
+
出行交通方式（必选）
*乘坐航班车次或车牌号码及座位号（没有填无）
-
+
+
+
+ 同行人
+
@@ -49,6 +66,8 @@ export default {
components: {UniCalendar,DateSelector},
data() {
return {
+ startTime: this.$moment().format('YYYY-MM-DD'),
+ endTime: this.$moment().format('YYYY-MM-DD'),
transports: [
{
value: '0',
@@ -75,8 +94,20 @@ export default {
name: '其他',
}
],
- carNumber: '',
- current: 0,
+ carNo: '',
+ journeys: [
+ {
+ value: '0',
+ name: '返校行程',
+ },
+ {
+ value: '1',
+ name: '日常外出',
+ }
+ ],
+ together: '',
+ tripMode: 0,
+ journeyType: 0,
agree: false
};
},
@@ -84,7 +115,16 @@ export default {
RadioChange: function(evt) {
for (let i = 0; i < this.transports.length; i++) {
if (this.transports[i].value === evt.target.value) {
- this.current = i;
+ this.tripMode = i;
+ break;
+ }
+ }
+ },
+
+ TypeChange: function(evt) {
+ for (let i = 0; i < this.journeys.length; i++) {
+ if (this.journeys[i].value === evt.target.value) {
+ this.journeyType = i;
break;
}
}
@@ -97,6 +137,7 @@ export default {
*/
getStartData(start) {
console.log('出发时间 start: ', start);
+ this.startTime = start;
},
/**
@@ -106,6 +147,7 @@ export default {
*/
getEndData(end) {
console.log('抵达时间 end: ', end);
+ this.endTime = end;
},
/**
@@ -114,30 +156,26 @@ export default {
async handleAddStroke() {
try {
if (!this.checkRules()) return;
-
const {
- address,
- animalHeat,
- district,
- healthTypeId,
- hospital,
- token,
- touchHubei,
- touchSick
+ carNo,
+ endTime,
+ journeyType,
+ startTime,
+ together,
+ tripMode
} = this;
const params = {
param: {
- address,
- animalHeat,
- district,
- healthTypeId,
- hospital,
- token,
- touchHubei,
- touchSick
+ carNo,
+ endTime: +this.$moment(endTime).format('x'),
+ journeyType: journeyType+1,
+ startTime: +this.$moment(startTime).format('x'),
+ together,
+ tripMode
}
};
- const res = await this.$http.post(HEALTH_SIGN, params);
+ console.log('params2',params)
+ const res = await this.$http.post(SUBMIT_JOURNEYS, params);
const {
success,
code,
@@ -145,14 +183,13 @@ export default {
data
} = res.data;
if (success && code === 200) {
- this.setHealthCode(data.healthCode)
this.success = true;
uni.reLaunch({
url: `/pages/index/index`,
});
} else {
uni.showToast({
- title: msg || '申请健康码成功',
+ title: msg || '行程添加成功',
icon: 'none'
});
}
@@ -160,7 +197,7 @@ export default {
console.log('error: ', error);
if (error.msg) {
uni.showToast({
- title: error.msg || '申请健康码失败',
+ title: error.msg || '行程添加失败',
icon: 'none'
});
}
@@ -169,13 +206,25 @@ export default {
// 验证信息
checkRules() {
- const { district,address,healthTypeId,animalHeat,agree } = this;
- if (!this.transports) {
- showToast('请选择身份');
+ const { startTime,endTime,journeyType,tripMode,carNo,agree } = this;
+ if (!this.startTime) {
+ showToast('请选择出发时间');
+ return;
+ }
+ if (!this.endTime) {
+ showToast('请选择抵达时间');
+ return;
+ }
+ if (this.journeyType<0) {
+ showToast('请选择行程类型');
+ return;
+ }
+ if (this.tripMode<0) {
+ showToast('请选择出行交通方式');
return;
}
- if (!this.carNumber) {
- showToast('请输入学号');
+ if (!this.carNo) {
+ showToast('乘坐航班车次或车牌号码及座位号');
return;
}
if (!this.agree) {
diff --git a/pages/apply-code/apply-code.vue b/pages/apply-code/apply-code.vue
index 133d4a9..85a56df 100644
--- a/pages/apply-code/apply-code.vue
+++ b/pages/apply-code/apply-code.vue
@@ -3,7 +3,11 @@