diff --git a/pages/radetail/joinActivity/edit.js b/pages/radetail/joinActivity/edit.js
index 28ef30c..1b3af6e 100644
--- a/pages/radetail/joinActivity/edit.js
+++ b/pages/radetail/joinActivity/edit.js
@@ -12,6 +12,7 @@ Page({
answerflag: "",
flagsex: 0,
useImg:0,
+ showReceiptUrl:false,
items: [{
name: 1,
value: '男',
@@ -191,19 +192,45 @@ Page({
wx.chooseImage({
success(res) {
const tempFilePaths = res.tempFilePaths
- console.log(config.api.imgUpload)
- console.log(res)
wx.uploadFile({
- url: config.api.imgUpload, // 仅为示例,非真实的接口地址
+ url: config.url+config.api.imgUpload,
filePath: tempFilePaths[0],
name: 'file',
header: {
'token': app.globalData.token
},
success(res) {
- const data = res.data
+ console.log(res)
+ if (res.statusCode == 200) {
+ that.setData({
+ receiptUrl: JSON.parse(res.data).data.url,
+ showReceiptUrl: true
+ })
+ } else if (res.statusCode == 413) {
+ wx.showToast({
+ title: '上传的图片太大,请重新上传',
+ icon: "none"
+ })
+ that.setData({
+ showReceiptUrl: false
+ })
+ } else {
+ wx.showToast({
+ title: '请上传正确的图片',
+ icon: "none"
+ })
+ that.setData({
+ showReceiptUrl: false
+ })
+ }
+ },
+ fail(error) {
+ wx.showToast({
+ title: "上传图片失败",
+ icon: "none"
+ })
that.setData({
- receiptUrl: JSON.parse(res.data).data.url
+ showReceiptUrl: false
})
}
})
@@ -220,7 +247,8 @@ Page({
}).then(res => {
if (res && res.data && res.data.activity) {
this.setData({
- useImg: res.data.activity.useImg
+ useImg: res.data.activity.useImg,
+ imgDetail: res.data.activity.imgDetail
})
if (res.data && res.data.activity && res.data.activity.question) {
that.setData({
diff --git a/pages/radetail/joinActivity/edit.wxml b/pages/radetail/joinActivity/edit.wxml
index 5568352..d6ec8a9 100644
--- a/pages/radetail/joinActivity/edit.wxml
+++ b/pages/radetail/joinActivity/edit.wxml
@@ -28,14 +28,18 @@
调查问卷
{{index+1}}.{{item.ques}}
-
+
-
-
-
-
- +
+
+ 请上传您需要上传的图片
+ {{imgDetail}}
+
+
+
+
+ +
+
\ No newline at end of file
diff --git a/pages/radetail/joinActivity/edit.wxss b/pages/radetail/joinActivity/edit.wxss
index d158e1b..9563ca3 100644
--- a/pages/radetail/joinActivity/edit.wxss
+++ b/pages/radetail/joinActivity/edit.wxss
@@ -21,7 +21,7 @@ input {
width: 400rpx;
height: 400rpx;
line-height: 400rpx;
- margin: 30rpx auto 0;
+ margin: 30rpx auto 140rpx;
border: 1px dotted orange;
}
.camera text{
@@ -101,7 +101,7 @@ radio {
}
.ques{
padding-left: 20rpx;
- margin-bottom:140rpx;
+ margin-bottom:70rpx;
}
.ques text{
display: block;
@@ -127,4 +127,14 @@ radio {
padding: 10rpx 0;
margin-top: 10rpx;
padding-left: 10rpx;
+}
+.quesTitle{
+ text-align: center;
+ font-size:32rpx;
+ text-indent: 1em;
+}
+.up-img image{
+ display: block;
+ width: 90%;
+ margin: 20rpx auto 0;
}
\ No newline at end of file
diff --git a/pages/spellGroup/mySpellGroup/index.wxss b/pages/spellGroup/mySpellGroup/index.wxss
index 929beac..a249463 100644
--- a/pages/spellGroup/mySpellGroup/index.wxss
+++ b/pages/spellGroup/mySpellGroup/index.wxss
@@ -58,8 +58,6 @@ button::after{ border: none; }
padding-top: 30rpx;
padding-left: 30rpx;
line-height: 50rpx;
- border-radius:20rpx 20rpx 0px 0px;
- margin-top: -25rpx;
opacity: 1;
font-size:32rpx;
font-weight:bold;
diff --git a/pages/topicDetail/index.wxml b/pages/topicDetail/index.wxml
index 9ba253f..10ebfd0 100644
--- a/pages/topicDetail/index.wxml
+++ b/pages/topicDetail/index.wxml
@@ -3,7 +3,7 @@
-
+
{{data.name}}
diff --git a/pages/topicDetail/index.wxss b/pages/topicDetail/index.wxss
index f382326..5e8172f 100644
--- a/pages/topicDetail/index.wxss
+++ b/pages/topicDetail/index.wxss
@@ -13,8 +13,6 @@
.banner {
position: relative;
width: 750rpx;
- height: 280rpx;
- overflow: hidden;
}
.banner image {
@@ -28,7 +26,7 @@
background: #fff;
border-radius: 12rpx;
width: 705rpx;
- margin: -30rpx auto 0;
+ margin: 30rpx auto 0;
padding-bottom: 20rpx;
}
diff --git a/wxParse/wxParse.js b/wxParse/wxParse.js
index 379f2f6..89c1000 100644
--- a/wxParse/wxParse.js
+++ b/wxParse/wxParse.js
@@ -33,12 +33,10 @@ function wxParse(bindName = 'wxParseData', type='html', data='