miniprogram / volunteer · 提交

转到一个项目

作者 root
提交 c34ef1cc99673b6affe2ace2fd7e660d64a46c21 2 个父辈 31c6397d 014c7f5c

合并分支 'sgj' 到 'master' 

sgj bugfix



查看合并请求 !2
内嵌 并排对比
正在显示 5 个修改的文件 包含 8 行增加 和 296 行删除
... ... @@ -23,7 +23,7 @@ Page({
let that = this;
that.get_city();
that.getList();
// that.getList();
},
... ... @@ -69,8 +69,10 @@ Page({
console.log(res)
that.setData({
array: res.city
})
that.getList();
}).catch((err) => {
})
... ...
... ... @@ -18,7 +18,6 @@ Page({
input_bottom: 100
})
},
// 失去焦点
no_focus: function(e) {
this.setData({
... ... @@ -28,7 +27,7 @@ Page({
// 输入信息
get_word(e) {
this.setData({
word: e.detail.value
word: e.detail.value
})
},
// 改变弹窗状态
... ...
... ... @@ -17,11 +17,12 @@ Page({
}
app.post(url, head).then((res) => {
console.log(res)
res.content = res.content.replace(/\<img/gi, '<img style="width:100%;height:auto" ')
that.setData({
list: res
})
}).catch((err) => {
})
... ...
... ... @@ -12,7 +12,7 @@ Page({
},
getdatalist() {
wx.showLoading({
title: '加载中',
title: '加载中',
mask: true
})
let that = this
... ...
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": false,
"es6": true,
"enhance": false,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": true,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": []
},
"compileType": "miniprogram",
"libVersion": "2.8.3",
"appid": "wx7a3bf4e0796c070a",
"projectname": "zhiyuanzhe",
"debugOptions": {
"hidedInDevtools": []
},
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": [
{
"id": 0,
"name": "工作计划表",
"pathName": "pages/word_report/word_report",
"query": "id=17&status=1",
"scene": null
},
{
"id": -1,
"name": "pages/myteam/myteam",
"pathName": "pages/myteam/myteam",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/mytrain/mytrain",
"pathName": "pages/mytrain/mytrain",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/Online_regulations/Online_regulations",
"pathName": "pages/Online_regulations/Online_regulations",
"query": "",
"scene": null
},
{
"id": 4,
"name": "学习内容",
"pathName": "pages/getStudycontent/getStudycontent",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/apply/apply",
"pathName": "pages/apply/apply",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/Volunteer_detail/Volunteer_detail",
"pathName": "pages/Volunteer_detail/Volunteer_detail",
"query": "",
"scene": null
},
{
"id": 7,
"name": "志愿回馈",
"pathName": "pages/myfeedback/myfeedback",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/myaddress/myaddress",
"pathName": "pages/myaddress/myaddress",
"query": "",
"scene": null
},
{
"id": 9,
"name": "志愿动态",
"pathName": "pages/Volunteer_dynamic/Volunteer_dynamic",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/guanlitiaoli/guanlitiaoli",
"pathName": "pages/guanlitiaoli/guanlitiaoli",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/mycertificate/mycertificate",
"pathName": "pages/mycertificate/mycertificate",
"query": "",
"scene": null
},
{
"id": 12,
"name": "申请加入",
"pathName": "pages/Volunteer_group/active/active",
"query": "",
"scene": null
},
{
"id": -1,
"name": "志愿团队",
"pathName": "pages/Volunteer_group/Volunteer_group",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的地址列表",
"pathName": "pages/myaddress/myaddress",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的收货地址",
"pathName": "pages/myaddcompile/myaddcompile",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的团队",
"pathName": "pages/myteam/myteam",
"query": "",
"scene": null
},
{
"id": 18,
"name": "商品详情",
"pathName": "pages/myfeedback/myfeedback_active/myfeedback_active",
"query": "",
"scene": null
},
{
"id": -1,
"name": "积分兑换",
"pathName": "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
"query": "",
"scene": null
},
{
"id": -1,
"name": "光荣排行",
"pathName": "pages/guangrongpaihang/guangrongpaihang",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的活动",
"pathName": "pages/myactivity/myactivity",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/myactivity/myactivity_active/myactivity_active",
"pathName": "pages/myactivity/myactivity_active/myactivity_active",
"query": "",
"scene": null
},
{
"id": -1,
"name": "答题详情",
"pathName": "pages/getStudycontent/answer/answer",
"query": "",
"scene": null
},
{
"id": 23,
"name": "在线培训",
"pathName": "pages/Online_regulations/Online_regulations",
"query": "",
"scene": null
},
{
"id": 24,
"name": "学习内容",
"pathName": "pages/getStudycontent/getStudycontent",
"query": "",
"scene": null
},
{
"id": -1,
"name": "dati ",
"pathName": "pages/getStudycontent/answer/answer",
"query": "id=1",
"scene": null
},
{
"id": -1,
"name": "电子证件",
"pathName": "pages/mycertificate/mycertificate",
"query": "",
"scene": null
},
{
"id": -1,
"name": "编辑资料",
"pathName": "pages/mydetail/mydetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "工时兑换",
"pathName": "pages/myfeedback/myfeedback_list/myfeedback_list",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的资料",
"pathName": "pages/mydetail/mydetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "更多志愿者",
"pathName": "pages/more/more",
"scene": null
}
]
}
}
}
\ No newline at end of file