diff --git a/app.json b/app.json
index 0a9a26d..2cfabeb 100644
--- a/app.json
+++ b/app.json
@@ -161,12 +161,6 @@
"pages/activity/redlist/index",
"pages/activity/subway/index",
"pages/activity/tenscenic/index",
- "pages/activity/huawei/index",
- "pages/activity/huawei/form/index",
- "pages/activity/huawei/result/index",
- "pages/activity/huawei/upload/index",
- "pages/activity/huawei/uploadres/index",
- "pages/activity/huawei/list/index",
"pages/kj/index",
"pages/kj/his/index",
"pages/kj/info/index",
diff --git a/images/ai.png b/images/ai.png
index 3f74b7e..6f71749 100644
Binary files a/images/ai.png and b/images/ai.png differ
diff --git a/images/ai_seld.png b/images/ai_seld.png
index da28b49..aaefadc 100644
Binary files a/images/ai_seld.png and b/images/ai_seld.png differ
diff --git a/images/index.png b/images/index.png
index d8cb4f8..08d6d28 100644
Binary files a/images/index.png and b/images/index.png differ
diff --git a/images/index_seld.png b/images/index_seld.png
index 0d194b0..a039bcb 100644
Binary files a/images/index_seld.png and b/images/index_seld.png differ
diff --git a/images/map.png b/images/map.png
index 417c935..5c7769e 100755
Binary files a/images/map.png and b/images/map.png differ
diff --git a/images/map_seld.png b/images/map_seld.png
index 25e6d9b..93c018b 100644
Binary files a/images/map_seld.png and b/images/map_seld.png differ
diff --git a/images/place1.png b/images/place1.png
index 0c65781..a8f4016 100755
Binary files a/images/place1.png and b/images/place1.png differ
diff --git a/images/place2.png b/images/place2.png
index 0bf09ad..c0d693f 100755
Binary files a/images/place2.png and b/images/place2.png differ
diff --git a/images/user.png b/images/user.png
index a84c2ac..be15404 100755
Binary files a/images/user.png and b/images/user.png differ
diff --git a/images/user_seld.png b/images/user_seld.png
index 578fb91..b422702 100644
Binary files a/images/user_seld.png and b/images/user_seld.png differ
diff --git a/pages/activity/huawei/form/index.js b/pages/activity/huawei/form/index.js
deleted file mode 100644
index 194363b..0000000
--- a/pages/activity/huawei/form/index.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// pages/activity/huawei/form/index.js
-import commonApi from "../../../../utils/https/common"
-import userApi from "../../../../utils/https/user"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- multiArray:[],
- multiIndex:[],
- areaList:[],
- info:{},
- brands:[],
- brandIndex:-1,
- id:null,
- info:{}
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- commonApi.user_post('actonline/act_online/getActDetail',{
- id:options.id
- }).then(res=>{
- this.setData({
- info:res.data
- })
- })
- commonApi.user_post('actonline/act_online/getMobileBrand',{}).then(res=>{
- let brands = []
- for(let i in res.data){
- brands.push({
- name:res.data[i],
- id:i
- })
- }
- this.setData({
- brands:brands,
- id:options.id
- })
- })
- },
- changeBrand:function(e){
- this.setData({
- brandIndex:e.detail.value
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
- changeName:function(e){
- let info = this.data.info
- info.name = e.detail.value
- this.setData({
- info:info
- })
- },
- changeTel:function(e){
- let info = this.data.info
- info.mobile = e.detail.value
- this.setData({
- info:info
- })
- },
- changeCard:function(e){
- let info = this.data.info
- info.card_number = e.detail.value
- this.setData({
- info:info
- })
- },
- submit:function(e){
- let info = this.data.info;
-
- if(!info.name){
- wx.showToast({
- title: '请输入姓名',
- icon:'none'
- })
- return;
- }
- if(info.mobile.length!=11){
- wx.showToast({
- title: '请输入正确的手机号',
- icon:'none'
- })
- return;
- }
- if(info.card_number.length!=18){
- wx.showToast({
- title: '请输入正确的身份证号码',
- icon:'none'
- })
- return;
- }
- if(this.data.brandIndex==-1){
- wx.showToast({
- title: '请选择手机品牌',
- icon:'none'
- })
- return;
- }
- info.id = this.data.id
- info.mobile_type = Number(this.data.brands[this.data.brandIndex].id)
- commonApi.user_post("actonline/act_online/actSign",info).then(res=>{
- if(res.code==1){
- wx.navigateTo({
- url: '../result/index?id='+this.data.id,
- })
- }
- })
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.json b/pages/activity/huawei/form/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/form/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "title":"/pages/component/TitleHeader"
- }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.wxml b/pages/activity/huawei/form/index.wxml
deleted file mode 100644
index e4a0c2e..0000000
--- a/pages/activity/huawei/form/index.wxml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- 姓名
-
-
-
- 联系方式
-
-
-
- 身份证
-
-
-
- 手机品牌
-
-
- {{brandIndex==-1?'请选择':brands[brandIndex].name}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.wxss b/pages/activity/huawei/form/index.wxss
deleted file mode 100644
index cacec9b..0000000
--- a/pages/activity/huawei/form/index.wxss
+++ /dev/null
@@ -1,72 +0,0 @@
-/* pages/activity/huawei/form/index.wxss */
-.topimg {
- display: block;
- width: 100%;
-}
-page {
- background: #003323;
-}
-.input-box {
- margin: 0 42rpx;
- position: relative;
- z-index: 1;
- margin-top: -130rpx;
- background: white;
- border-radius: 16rpx;
- font-size: 31rpx;
- padding: 30rpx 52rpx;
-}
-.input-box image {
- display: block;
- width: 264rpx;
- height: 68rpx;
-}
-.input-box image.submit-btn {
- display: block;
- width: 561rpx;
- height: 104rpx;
- margin: 0 auto;
- margin-top: 35rpx;
-}
-.input-box input {
- display: block;
- padding: 10rpx 30rpx;
- width: 420rpx;
- height: 71rpx;
- line-height: 71rpx;
- background: #FFFFFF;
- border: 1rpx solid #CCCCCC;
- border-radius: 10rpx;
- box-sizing: border-box;
- color: #333;
- font-size: 32rpx;
- font-weight: 500;
- flex-shrink: 0;
-}
-.input-item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-weight: 500;
- font-size: 32rpx;
- color: #333333;
- margin-top: 45rpx;
- margin-bottom: 45rpx;
-}
-.picker {
- padding: 0 30rpx;
- width: 420rpx;
- height: 71rpx;
- line-height: 71rpx;
- background: #FFFFFF;
- border: 1rpx solid #CCCCCC;
- border-radius: 10rpx;
- box-sizing: border-box;
- color: #333;
- font-size: 32rpx;
- font-weight: 500;
- flex-shrink: 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/index.js b/pages/activity/huawei/index.js
deleted file mode 100644
index 20e1d98..0000000
--- a/pages/activity/huawei/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// pages/activity/huawei/index.js
-const sys = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect();
-let height = sys.screenHeight - (rect.top - sys.statusBarHeight) * 2 - rect.height - sys.statusBarHeight;
-import commonApi from "../../../utils/https/common"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- height:height,
- isReg:false,
- id:null,
- info:{},
- showRuleFlag:false
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- // 判断是否报名
- this.setData({
- id:options.id
- })
- commonApi.user_post("actonline/act_online/isSign",{id:options.id}).then(res=>{
- this.setData({
- isReg:res.data
- })
- })
- commonApi.user_post("actonline/act_online/getActDetail",{
- id:options.id
- }).then(res=>{
- if(res.data){
- for(let i in res.data){
- if(i.indexOf('time')!=-1 && res.data[i]){
- res.data[i] = res.data[i].replace(/-/g,'.')
- res.data[i] = res.data[i].substr(0,res.data[i].length-3)
- }
- }
- this.setData({
- info:res.data
- })
- }
- })
- },
- showRule:function(){
- this.setData({
- showRuleFlag:!this.data.showRuleFlag
- })
- },
- gotoPath:function(e){
- let path = e.currentTarget.dataset.path;
- wx.navigateTo({
- url: path
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/index.json b/pages/activity/huawei/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "title":"/pages/component/TitleHeader"
- }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxml b/pages/activity/huawei/index.wxml
deleted file mode 100644
index e4be85a..0000000
--- a/pages/activity/huawei/index.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- 规则
- 线上报名时间：{{info.sign_begin_time}} - {{info.sign_end_time}}
- 线上投票时间：{{info.begin_time}} - {{info.end_time}}
-
-
-
- {{info.sub_title}}
-
-
-
-
-
- • 活动规则 •
-
-
-
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxss b/pages/activity/huawei/index.wxss
deleted file mode 100644
index 54b74f3..0000000
--- a/pages/activity/huawei/index.wxss
+++ /dev/null
@@ -1,71 +0,0 @@
-/* pages/activity/huawei/index.wxss */
-.info-box {
- position: absolute;
- left: 0;
- right: 0;
- bottom: 0;
- background: url(https://static.ticket.sz-trip.com/xcxImages/huawei/bg.png);
- background-size: 100% 100%;
- background-repeat: no-repeat;
- display: flex;
- flex-direction: column;
- justify-content: flex-end;
- align-items: center;
-}
-.bg {
- position: absolute;
- left: 0;
- right: 0;
- bottom: 0;
- top: 0;
-}
-.btnimg {
- display: block;
- width: 558rpx;
- height: 104rpx;
- margin-bottom: 23rpx;
-}
-.bottomtext {
- color: #fff;
- text-align: center;
- font-size: 24rpx;
- margin-bottom: 45rpx;
-}
-.rule-btn {
- font-size: 27rpx;
- color: #fff;
- font-weight: 500;
- width: 73rpx;
- height: 73rpx;
- border: 1rpx solid;
- border-radius: 50%;
- position: absolute;
- right: 30rpx;
- top: 30rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- box-sizing: border-box;
-}
-.tiptext {
- color: #fff;
- font-size: 25rpx;
- margin-top: 20rpx;
-}
-.rule-box {
- height: 50%;
- overflow-y: auto;
- font-size: 27rpx;
- color: #010101;
- padding: 0 50rpx;
- width: 500rpx;
- padding-bottom: 30rpx;
- line-height: 46rpx;
-}
-.rule-title {
- text-align: center;
- font-size: 32rpx;
- color: #000;
- font-weight: 500;
- line-height: 100rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.js b/pages/activity/huawei/list/index.js
deleted file mode 100644
index b97fc66..0000000
--- a/pages/activity/huawei/list/index.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// pages/activity/huawei/list/index.js
-import commonApi from "../../../../utils/https/common"
-let app = getApp()
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- id:null,
- types:[],
- typeIndex:0,
- list:[],
- detail:{},
- showRuleFlag:false,
- user_id:null,
- isReg:false
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- this.setData({
- id:options.id
- })
- if(options.user_id){
- let user_id = wx.getStorageSync('jstrip_userid');
- if(user_id!=options.user_id){
- app.globalData.weburl = 'https://m.cloud.sz-trip.com/photoWorksDetail?id='+options.id+'&type_id='+options.type_id
- wx.redirectTo({
- url: '/pages/pbService/web/index'
- })
- return;
- }
- }
- commonApi.user_post("actonline/act_online/isSign",{id:options.id}).then(res=>{
- if(res.code==1){
- this.setData({
- isReg:res.data
- })
- }
- })
- commonApi.user_post("actonline/act_online/getActDetail",{id:options.id}).then(res=>{
- this.setData({
- detail:res.data
- })
- })
- commonApi.user_post("actonline/act_online/getActTypeList",{
- act_id:this.data.id
- }).then(res=>{
- this.setData({
- types:res.data
- })
- if(res.data.length>0){
- this.getList()
- }
-
- })
- },
- showRule:function(){
- this.setData({
- showRuleFlag:!this.data.showRuleFlag
- })
- },
- reUpload:function(){
- let that = this;
- wx.showModal({
- title:"提示",
- content:"一个分类的作品多次提交，平台只保留最近上传的作品。",
- cancelText:"否",
- confirmText:"是",
- success:function(res){
- if(res.confirm){
- that.gotoUpload()
- }
- }
- })
- },
- changeType:function(e){
- this.setData({
- typeIndex:e.currentTarget.dataset.type,
- list:[]
- })
- this.getList()
- },
- getList:function(){
- commonApi.user_post("actonline/act_online/myWork",{
- type_id:this.data.types[this.data.typeIndex].id,
- id:this.data.id,
- page:1,
- limit:100,
- user_id:this.data.user_id || null
- }).then(res=>{
- if(this.data.user_id && res.data.data[0].status!=1){
- res.data.data = []
- }
- this.setData({
- list:res.data.data
- })
-
- this.onShareAppMessage()
- })
- },
- gotoUpload:function(){
- if(this.data.isReg){
- wx.navigateTo({
- url: '../upload/index?id='+this.data.id
- })
- }
- else {
- wx.navigateTo({
- url: '../index?id='+this.data.id
- })
- }
- },
- vote:function(e){
- let that = this
- commonApi.user_post("actonline/act_online/vote",{
- id:this.data.list[0].id
- }).then(res=>{
- if(res.code==1){
- wx.showToast({
- title: '投票成功',
- icon:'success'
- })
- let list = this.data.list;
- list[0].votes = Number(list[0].votes) + 1;
- }
- else if(res.code==-1){
- wx.showModal({
- title:"提示",
- content:res.msg,
- confirmText:"关闭",
- cancelText:"前往报名",
- success:function(res){
- if(!res.confirm){
- wx.navigateTo({
- url: '/pages/activity/huawei/index?id='+that.data.id
- })
- }
- }
- })
- }
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
- if(this.data.list.length>0){
- return {
- title:"帮我投一票吧~",
- path:'/pages/activity/huawei/list/index?id='+this.data.list[0].act_online_id+'&type_id='+this.data.list[0].act_online_type+'&user_id='+this.data.list[0].user.id+'&did='+this.data.list[0].id,
- imageUrl:this.data.list[0].img
- }
- }
- else {
- return {
- title:"君到苏州摄影大赛作品",
- path:"/pages/pbService/web/index?url="+encodeURIComponent('https://m.cloud.sz-trip.com/photoWorksList?id=6'),
- imageUrl:"https://m.cloud.sz-trip.com/static/images/logobai.png"
- }
- }
- }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.json b/pages/activity/huawei/list/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/list/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "title":"/pages/component/TitleHeader"
- }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.wxml b/pages/activity/huawei/list/index.wxml
deleted file mode 100644
index dbb0d71..0000000
--- a/pages/activity/huawei/list/index.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- {{item.title}}
-
-
- {{list[0].title}}
-
-
- {{list[0].user.nickname}}
- 作品id：{{list[0].id}}
-
-
- 作品id：{{list[0].id}}
- 作品状态：
- {{list[0].status_text}}
-
- 拒绝理由：{{list[0].refund_msg}}
-
-
- 当前得票：{{list[0].votes}}
- 投票
-
-
- {{list[0].desc}}
-
- 规则
-
-
-
-
-
- 投票已开始，无法上传作品！
-
-
-
-
-
- • 活动规则 •
-
-
-
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.wxss b/pages/activity/huawei/list/index.wxss
deleted file mode 100644
index 6ceb225..0000000
--- a/pages/activity/huawei/list/index.wxss
+++ /dev/null
@@ -1,163 +0,0 @@
-/* pages/activity/huawei/list/index.wxss */
-.tabs {
- display: flex;
- align-items: center;
- flex-wrap: nowrap;
- overflow-x: auto;
- margin: 0 27rpx;
- height: 92rpx;
- border-bottom: 1rpx solid #cccccc;
- color: #666;
- font-size: 31rpx;
- padding: 0 28rpx;
-}
-.tab {
- margin-right: 140rpx;
- position: relative;
- line-height: 92rpx;
- flex-shrink: 0;
-}
-.tab:last-child {
- margin-right: 0;
-}
-.tab.active {
- color: #000;
- font-weight: 500;
-}
-.tab.active::after {
- content: "1";
- font-size: 0;
- display: block;
- position: absolute;
- width: 60rpx;
- left: 50%;
- margin-left: -30rpx;
- bottom: 0;
- height: 7rpx;
- background: linear-gradient(0deg, rgba(251, 197, 34, 0.93), rgba(255, 252, 0, 0.93));
- border-radius: 3rpx;
-}
-.title {
- text-align: center;
- padding: 39rpx 30rpx;
- margin-top: 12rpx;
- font-size: 36rpx;
- color: #333;
- font-weight: bold;
-}
-.mainimg {
- display: block;
- margin: 0 auto;
- width: 625rpx;
- border: 13rpx solid #FEE5C6;
- margin-bottom: 50rpx;
-}
-.content {
- margin: 0 52rpx;
- padding-bottom: 30rpx;
- font-size: 27rpx;
- color: #333333;
-}
-.emptyimg {
- display: block;
- margin: 91rpx auto;
- width: 414rpx;
- height: 193rpx;
-}
-.tip1 {
- text-align: center;
- font-size: 35rpx;
- color: #000000;
-}
-.btnimg {
- width: 558rpx;
- margin: 0 auto;
- margin-top: 86rpx;
- display: block;
-}
-.work-tips-my {
- display: flex;
- justify-content: space-between;
- align-items: center;
- font-size: 31rpx;
- color: #666;
- margin: 0 53rpx;
- padding: 20rpx 0;
-}
-.work-tips-my view {
- flex: 1;
-}
-.work-tips-my .status {
- color: #CC0000;
-}
-.work-tips-my .status.active {
- color: #169900;
-}
-.count-num {
- color: #333;
- font-size: 31rpx;
- font-weight: 500;
-}
-.rule-btn {
- width: 143rpx;
- position: fixed;
- text-align: center;
- line-height: 66rpx;
- background: #FFFC00;
- border-top-left-radius: 33rpx;
- border-bottom-left-radius: 33rpx;
- font-size: 31rpx;
- color: #333333;
- padding-right: 10rpx;
- right: 0;
- bottom: 246rpx;
-}
-.rule-box {
- height: 50%;
- overflow-y: auto;
- font-size: 27rpx;
- color: #010101;
- padding: 0 50rpx;
- width: 500rpx;
- padding-bottom: 30rpx;
- line-height: 46rpx;
-}
-.rule-title {
- text-align: center;
- font-size: 32rpx;
- color: #000;
- font-weight: 500;
- line-height: 100rpx;
-}
-.vote-box {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin: 0 53rpx;
- padding-bottom: 50rpx;
-}
-.vote-btn {
- width: 175rpx;
- line-height: 64rpx;
- background: linear-gradient(0deg, rgba(251, 197, 34, 0.93), rgba(255, 252, 0, 0.93));
- border-radius: 32rpx;
- text-align: center;
- color: #333333;
- font-size: 31rpx;
- font-weight: 500;
-}
-.work-tips-my image {
- display: block;
- width: 53rpx;
- height: 53rpx;
- border-radius: 50%;
-}
-.work-tips-my view.nickname {
- font-size: 28rpx;
- margin: 0 20rpx;
-}
-.refund-msg {
- color: #CC0000;
- margin: 30rpx 53rpx;
- margin-top: 10rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/result/index.js b/pages/activity/huawei/result/index.js
deleted file mode 100644
index 11a206b..0000000
--- a/pages/activity/huawei/result/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// pages/activity/huawei/result/index.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- id:null
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- this.setData({
- id:options.id
- })
- },
- upload:function(e){
- wx.navigateTo({
- url: '../upload/index?id='+this.data.id
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/result/index.json b/pages/activity/huawei/result/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/result/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "title":"/pages/component/TitleHeader"
- }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/result/index.wxml b/pages/activity/huawei/result/index.wxml
deleted file mode 100644
index c322998..0000000
--- a/pages/activity/huawei/result/index.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-恭喜您已报名成功！
-点击下方按钮开始进行作品上传
-
-
diff --git a/pages/activity/huawei/result/index.wxss b/pages/activity/huawei/result/index.wxss
deleted file mode 100644
index 8961d11..0000000
--- a/pages/activity/huawei/result/index.wxss
+++ /dev/null
@@ -1,30 +0,0 @@
-/* pages/activity/huawei/result/index.wxss */
-.logo {
- margin: 64rpx auto;
- width: 415rpx;
- height: 393rpx;
- display: block;
-}
-page {
- text-align: center;
- color: #666666;
- font-size: 28rpx;
-}
-.uploadimg {
- display: block;
- width: 558rpx;
- height: 104rpx;
- margin: 0 auto;
-}
-.arrowimg {
- display: block;
- margin: 35rpx auto;
- width: 42rpx;
- height: 58rpx;
-}
-.text {
- font-size: 45rpx;
- font-weight: 500;
- color: #000000;
- margin-bottom: 20rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.js b/pages/activity/huawei/upload/index.js
deleted file mode 100644
index b638fdc..0000000
--- a/pages/activity/huawei/upload/index.js
+++ /dev/null
@@ -1,234 +0,0 @@
-// pages/activity/huawei/upload/index.js
-import commonApi from "../../../../utils/https/common"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- id:null,
- types:[],
- typeIndex:-1,
- title:"",
- img:null,
- desc:"",
- date:null,
- address:""
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- this.setData({
- id:options.id
- })
- commonApi.user_post('actonline/act_online/getActTypeList',{
- act_id:options.id
- }).then(res=>{
- this.setData({
- types:res.data
- })
- })
- },
- changeType:function(e){
- this.setData({
- typeIndex:e.detail.value
- })
- },
- changeTitle:function(e){
- this.setData({
- title:e.detail.value
- })
- },
- changeContent:function(e){
- this.setData({
- desc:e.detail.value
- })
- },
- uploadImg:function(){
- let that = this;
- wx.chooseImage({
- count: 1,
- sizeType: ['original', 'compressed'],
- sourceType: ['album', 'camera'],
- success (res) {
- // tempFilePath可以作为img标签的src属性显示图片
- const tempFilePaths = res.tempFilePaths[0]
- if(tempFilePaths.substr(tempFilePaths.length-4,4)=='.gif'){
- wx.showToast({
- title: '图片格式错误',
- icon:'none'
- })
- return;
- }
- wx.showLoading({
- title: '图片上传中，请稍后'
- })
- wx.uploadFile({
- url: 'https://api.cloud.sz-trip.com/api/pbservice.other/upload', //这里是上传的服务器地址
- filePath: tempFilePaths,
- header:{
- token: wx.getStorageSync('jstrip_token'),
- },
- name: "file",
- success: function (res) {
- var res = JSON.parse(res.data);
- let img = res.data.url;
- that.setData({
- img:img
- })
- wx.hideLoading();
- },
- fail:function(res){
- wx.hideLoading();
- }
- })
- }
- })
- },
- bindDateChange:function(e){
- this.setData({
- date:e.detail.value
- })
- },
- changeAddress:function(e){
- this.setData({
- address:e.detail.value
- })
- },
- submit:function(){
- if(!this.data.title){
- wx.showToast({
- title: '请输入作品标题',
- icon:'none'
- })
- return;
- }
- if(this.getCNLen(this.data.title)>30){
- wx.showToast({
- title: '作品标题过长',
- icon:'none'
- })
- return;
- }
- if(this.data.typeIndex==-1){
- wx.showToast({
- title: '请选择分类',
- icon:'none'
- })
- return;
- }
- if(!this.data.date){
- wx.showToast({
- title: '请选择拍摄时间',
- icon:'none'
- })
- return;
- }
- if(!this.data.address){
- wx.showToast({
- title: '请输入您所上传照片的拍摄地点',
- icon:'none'
- })
- return;
- }
- if(!this.data.img){
- wx.showToast({
- title: '请上传图片',
- icon:'none'
- })
- return;
- }
- if(!this.data.desc){
- wx.showToast({
- title: '请输入作品描述',
- icon:'none'
- })
- return;
- }
- if(this.getCNLen(this.data.desc)>600){
- wx.showToast({
- title: '作品描述过长',
- icon:'none'
- })
- return;
- }
- commonApi.user_post("actonline/act_online/uploadWork",{
- title:this.data.title,
- img:this.data.img,
- desc:this.data.desc,
- type_id:this.data.types[this.data.typeIndex].id,
- id:this.data.id,
- shot_time:this.data.date,
- shot_address:this.data.address
- }).then(res=>{
- if(res.code==1){
- wx.navigateTo({
- url: '../uploadres/index?id='+this.data.id
- })
- }
- })
-
- },
- getCNLen:function(str){
- var len = 0;
- for (var i=0; i127 || str.charCodeAt(i)==94) {
- len += 2;
- } else {
- len ++;
- }
- }
- return len;
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.json b/pages/activity/huawei/upload/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/upload/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "title":"/pages/component/TitleHeader"
- }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.wxml b/pages/activity/huawei/upload/index.wxml
deleted file mode 100644
index f35bff1..0000000
--- a/pages/activity/huawei/upload/index.wxml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
- 作品标题
-
-
-
- 选择分类
-
-
- {{typeIndex==-1?'请选择':types[typeIndex].title}}
-
-
-
-
-
- 拍摄时间
-
-
- {{!date?'请选择':date}}
-
-
-
-
-
- 拍摄地点
-
-
-
-上传图片
-
-
-作品描述
-
-
-一个分类的作品多次提交，平台只保留最近上传的作品
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.wxss b/pages/activity/huawei/upload/index.wxss
deleted file mode 100644
index 7eb9cd8..0000000
--- a/pages/activity/huawei/upload/index.wxss
+++ /dev/null
@@ -1,112 +0,0 @@
-/* pages/activity/huawei/upload/index.wxss */
-.topimg {
- display: block;
- width: 100%;
-}
-page {
- background: #F7F7F7;
-}
-.input-box {
- margin: 0 24rpx;
- margin-top: -60rpx;
- position: relative;
- z-index: 1;
- border-radius: 7rpx;
- background: white;
- padding: 32rpx 28rpx;
- font-size: 31rpx;
- color: #333333;
-}
-.input-item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 24rpx;
- margin-bottom: 27rpx;
-}
-.input-box text {
- margin-right: 20rpx;
- flex-shrink: 0;
- font-size: 31rpx;
-}
-.input-box input {
- width: 483rpx;
- height: 80rpx;
- line-height: 80rpx;
- box-sizing: border-box;
- display: block;
- padding: 0 15rpx;
- border: 1rpx solid #CCCCCC;
- border-radius: 4rpx;
-}
-.input-box .input-item:last-child{
- margin-bottom: 0;
-}
-.picker {
- display: flex;
- width: 483rpx;
- height: 80rpx;
- box-sizing: border-box;
- padding-left: 15rpx;
- border: 1rpx solid #CCCCCC;
- border-radius: 4rpx;
- align-items: center;
- justify-content: space-between;
-}
-.picker .iconfont {
- width: 80rpx;
- text-align: center;
- line-height: 80rpx;
- border-left: 1rpx solid #CCCCCC;
- flex-shrink: 0;
-}
-.picker .areatext {
- flex: 1;
-}
-.tip1 {
- font-size: 36rpx;
- padding-left: 52rpx;
- margin-top: 46rpx;
- margin-bottom: 26rpx;
- position: relative;
- line-height: 33rpx;
-}
-.tip1::before {
- content:"1";
- font-size: 0;
- position: absolute;
- width: 10rpx;
- height: 33rpx;
- left: 24rpx;
- top: 0;
- background: linear-gradient(0deg, rgba(251, 197, 34, 0.93), rgba(255, 252, 0, 0.93));
-}
-.uploadimg {
- display: block;
- margin-left: 24rpx;
- width: 249rpx;
- height: 191rpx;
- margin-bottom: 50rpx;
-}
-.textarea {
- font-size: 24rpx;
- margin: 24rpx;
- padding: 20rpx 30rpx;
- border-radius: 7rpx;
- background: white;
- display: block;
- height: 230rpx;
- width: 640rpx;
-}
-.uploadbtn {
- display: block;
- margin: 40rpx auto;
- width: 558rpx;
- height: 104rpx;
-}
-.tip2 {
- text-align: center;
- font-size: 24rpx;
- color: #b2b2b2;
- padding-bottom: 40rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.js b/pages/activity/huawei/uploadres/index.js
deleted file mode 100644
index 4fd04e0..0000000
--- a/pages/activity/huawei/uploadres/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// pages/activity/huawei/uploadres/index.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- id:null
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- this.setData({
- id:options.id
- })
- },
- gotoPath:function(e){
- wx.navigateTo({
- url: e.currentTarget.dataset.path,
- })
- },
- backhome:function(){
- wx.switchTab({
- url: '/pages/index/index'
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.json b/pages/activity/huawei/uploadres/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/uploadres/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "title":"/pages/component/TitleHeader"
- }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxml b/pages/activity/huawei/uploadres/index.wxml
deleted file mode 100644
index 76a59da..0000000
--- a/pages/activity/huawei/uploadres/index.wxml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-恭喜您的作品已上传完成！
-
-
-通过第一轮评审的摄影作品将在9月1号后
-进行线上展示，请注意查看平台通知
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxss b/pages/activity/huawei/uploadres/index.wxss
deleted file mode 100644
index 3c5cf0f..0000000
--- a/pages/activity/huawei/uploadres/index.wxss
+++ /dev/null
@@ -1,26 +0,0 @@
-/* pages/activity/huawei/uploadres/index.wxss */
-.logo {
- display: block;
- margin: 64rpx auto;
- width: 414rpx;
- height: 393rpx;
-}
-.tip1 {
- font-size: 45rpx;
- color: #000000;
- font-weight: 500;
- margin-bottom: 90rpx;
- text-align: center;
-}
-.btnimg {
- display: block;
- margin: 24rpx auto;
- width: 558rpx;
- height: 104rpx;
-}
-.tip2 {
- text-align: center;
- font-size: 28rpx;
- color: #666;
- margin-bottom: 20rpx;
-}
\ No newline at end of file
diff --git a/pages/info/foodNew/index.js b/pages/info/foodNew/index.js
index 6d25d54..0e38492 100644
--- a/pages/info/foodNew/index.js
+++ b/pages/info/foodNew/index.js
@@ -3,7 +3,7 @@ let device = wx.getSystemInfoSync();
const ratio = device.windowWidth / 750;
import commonApi from "../../../utils/https/common"
import QRCode from '../../../utils/weapp-qrcode.js'
-import util from '../../../utils/util'
+import {pagePoint, gotoDetail} from '../../../utils/util'
let app = getApp()
Page({
@@ -316,7 +316,7 @@ Page({
return;
} else {
if (skuFlag == 'order') {
- util.pagePoint({
+ pagePoint({
event: 'product_order',
param: {
id: this.data.info.id,
@@ -390,7 +390,7 @@ Page({
// 分享
share: function () {
if (!wx.getStorageSync("jstrip_token")) {
- util.pagePoint({
+ pagePoint({
event: 'product_share_login',
type: this.data.info.type,
id: this.data.info.id
@@ -429,7 +429,7 @@ Page({
that.setData({
showShareFlag: !this.data.showShareFlag
})
- util.pagePoint({
+ pagePoint({
event: 'product_share_save',
type: that.data.info.type,
id: that.data.info.id
@@ -463,7 +463,7 @@ Page({
},
pagePoint: function (e) {
- util.pagePoint(e)
+ pagePoint(e)
},
// 绘制海报
drawImg: function () {
@@ -656,7 +656,7 @@ Page({
},
gotoDetail: function (e) {
let item = e.currentTarget.dataset.item;
- util.pagePoint({
+ pagePoint({
event: 'recommend_click',
param: {
id: item.id,
@@ -669,7 +669,7 @@ Page({
url: '/pages/info/strategyInfo/index?id=' + item.s_id,
})
} else {
- util.gotoDetail(item);
+ gotoDetail(item);
}
},