diff --git a/app.js b/app.js
index dea4d17..8d1fc3c 100644
--- a/app.js
+++ b/app.js
@@ -1,11 +1,13 @@
//app.js
-var urlPath = require('./config.js');
App({
- globalData: {
- isLogin : false
- },
onLaunch: function () {
- var that = this;
- wx.setStorageSync('urlPath', urlPath);
- },
+ // 微信小程序原生API性能优化
+ // #ifdef MP-WEIXIN
+ let hInfo = wx.getAccountInfoSync();
+ // console.log(hInfo.envVersion);//develop:开发版 trial:体验版 release:正式版
+ if(hInfo.miniProgram.envVersion != "develop"){
+ console.log = () =>{}
+ }
+ // #endif
+ }
})
\ No newline at end of file
diff --git a/app.json b/app.json
index 3771919..5320c00 100644
--- a/app.json
+++ b/app.json
@@ -2,15 +2,32 @@
"pages": [
"pages/canvasposter/canvasposter",
"pages/index/index",
- "pages/again/again",
- "pages/sign/sign",
"pages/user/user",
- "pages/rule/rule",
- "pages/ranking/ranking",
- "pages/picture/picture",
- "pages/personal/personal",
- "pages/auth/auth",
- "pages/works/works"
+ "pages/ranking/ranking"
+ ],
+ "subpackages": [
+ {
+ "root": "pagesA",
+ "name": "secends",
+ "pages": [
+ "pages/works/works",
+ "pages/rule/rule",
+ "pages/picture/picture",
+ "pages/sign/sign",
+ "pages/personal/personal",
+ "pages/auth/auth"
+ ]
+ }
+ ],
+ "preloadRule": {
+ "pages/index/index": {
+ "network": "all",
+ "packages": ["secends"]
+ }
+ },
+ "requiredBackgroundModes": [
+ "audio",
+ "location"
],
"tabBar": {
"custom": true,
diff --git a/app.wxss b/app.wxss
index e432794..cc924d0 100644
--- a/app.wxss
+++ b/app.wxss
@@ -46,7 +46,6 @@ view{
font-size: 30rpx;
}
.countdown .names text{
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAfMAAAAJCAYAAAAmccWAAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyVpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ2MCwgMjAyMC8wNS8xMi0xNjowNDoxNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjIgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Mzk0M0RGRkRGNEJDMTFFQUExNzhEOURGMjAwQUZGODIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Mzk0M0RGRkVGNEJDMTFFQUExNzhEOURGMjAwQUZGODIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozOTQzREZGQkY0QkMxMUVBQTE3OEQ5REYyMDBBRkY4MiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozOTQzREZGQ0Y0QkMxMUVBQTE3OEQ5REYyMDBBRkY4MiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhtKAecAAAElSURBVHja7Nu9asJQGMbxk+AN6FAoOHRTlGZz7A0InVoHR6eWDg6dewvq6N6OgmDpRXToVOiqOCjYoR8XUNInTQIOJe2Q4Q35/+AB5WR6Ai+exOOFYehgS3v8mn70laFyoTSUd2Wh3Cjb9KKX6wNKA8DcKTGfCszylFtlojST7zVloDwpR1QEgLmDnxvXGu1owaZzZZax/qCcUhMA5g7YmdvV/2O9q1SpCQBzBxXlWTmmikL+EDt08fssAMhD/R9z542azAnYmRfXl7KhBgA5WlNBcXfmATWYFL2Xus9Yj/5d+klNAHJ0p/Qy1ufKGTXZ43E0zZ69IyJT5fKXS1bKSboz54gIAOZOufGY3bYrFx8JeVQ+lKWLj4x0HI/YATB3kPgWYABV0EFs4jF8rAAAAABJRU5ErkJggg==") no-repeat center;
background-size:499rpx 10rpx;
display: inline-block;
width: 100%;
diff --git a/img/background/3.png b/img/background/3.png
index 6878d02..0fe3637 100644
Binary files a/img/background/3.png and b/img/background/3.png differ
diff --git a/img/banner.png b/img/banner.png
deleted file mode 100644
index ba53838..0000000
Binary files a/img/banner.png and /dev/null differ
diff --git a/img/button/2.png b/img/button/2.png
deleted file mode 100644
index bf4eded..0000000
Binary files a/img/button/2.png and /dev/null differ
diff --git a/img/decorate/3.png b/img/decorate/3.png
deleted file mode 100644
index 4ac0ef4..0000000
Binary files a/img/decorate/3.png and /dev/null differ
diff --git a/img/download-icon.png b/img/download-icon.png
deleted file mode 100644
index e2b1c70..0000000
Binary files a/img/download-icon.png and /dev/null differ
diff --git a/img/face/4.png b/img/face/4.png
deleted file mode 100644
index 3b58c21..0000000
Binary files a/img/face/4.png and /dev/null differ
diff --git a/img/icon_01.png b/img/icon_01.png
deleted file mode 100644
index fcbff29..0000000
Binary files a/img/icon_01.png and /dev/null differ
diff --git a/img/icon_03.png b/img/icon_03.png
deleted file mode 100644
index 72d6372..0000000
Binary files a/img/icon_03.png and /dev/null differ
diff --git a/img/icon_04.png b/img/icon_04.png
deleted file mode 100644
index e25b15e..0000000
Binary files a/img/icon_04.png and /dev/null differ
diff --git a/img/icon_05.png b/img/icon_05.png
deleted file mode 100644
index e7a5f8b..0000000
Binary files a/img/icon_05.png and /dev/null differ
diff --git a/img/icon_06.png b/img/icon_06.png
deleted file mode 100644
index 9b97232..0000000
Binary files a/img/icon_06.png and /dev/null differ
diff --git a/img/img_01.png b/img/img_01.png
deleted file mode 100644
index ee74138..0000000
Binary files a/img/img_01.png and /dev/null differ
diff --git a/img/img_02.png b/img/img_02.png
deleted file mode 100644
index bc8e77b..0000000
Binary files a/img/img_02.png and /dev/null differ
diff --git a/img/img_03.png b/img/img_03.png
deleted file mode 100644
index b096e3a..0000000
Binary files a/img/img_03.png and /dev/null differ
diff --git a/img/opera/3.png b/img/opera/3.png
deleted file mode 100644
index 23966f9..0000000
Binary files a/img/opera/3.png and /dev/null differ
diff --git a/img/personage/1.png b/img/personage/1.png
deleted file mode 100644
index 80a6483..0000000
Binary files a/img/personage/1.png and /dev/null differ
diff --git a/img/personage/3.png b/img/personage/3.png
deleted file mode 100644
index 2c6291c..0000000
Binary files a/img/personage/3.png and /dev/null differ
diff --git a/img/share-icon.png b/img/share-icon.png
deleted file mode 100644
index 303010d..0000000
Binary files a/img/share-icon.png and /dev/null differ
diff --git a/img/word/2.png b/img/word/2.png
deleted file mode 100644
index a90124c..0000000
Binary files a/img/word/2.png and /dev/null differ
diff --git a/pages/again/again.js b/pages/again/again.js
deleted file mode 100644
index 5f5c8bc..0000000
--- a/pages/again/again.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// pages/sign/sign.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- img_url:wx.getStorageSync('img_url'),
- swiperCurrent:0,
- autoplay: false,
- interval: 3000,
- duration: 800,
- //倒计时数据
- endTime: '2020/11/22 10:40:30',
- //
- tab_number:31,//参与者
- tab_vote:2375,//投票数
- tab_visit:55,//访问次数
- //上传图
- source:'',
- is_upload:'0',
- },
- /**
- * 上传图片
- */
-uploadimg:function(){
- var that = this;
- wx.chooseImage({ //从本地相册选择图片或使用相机拍照
- count: 1, // 默认9
- sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
- sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
- success:function(res){
- //前台显示
- that.setData({
- source: res.tempFilePaths,
- is_upload:'1'
- })
- // 返回选定照片的本地文件路径列表,tempFilePath可以作为img标签的src属性显示图片
- var tempFilePaths = res.tempFilePaths
- wx.uploadFile({
- url: '#',
- filePath: tempFilePaths[0],
- name: 'file',
- success:function(res){
- //打印
- }
- })
- }
- })
- //https://www.jb51.net/article/132557.htm 后端源码
-},
- //上传图片
- swiperChange: function (e) {
- this.setData({
- swiperCurrent: e.detail.current
- })
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- var that = this;
- that.countDown()
- },
-// 倒计时
- countDown:function(){
- var that=this;
- var nowTime = new Date().getTime();//现在时间(时间戳)
- var endTime = new Date(that.data.endTime).getTime();//结束时间(时间戳)
- var time = (endTime-nowTime)/1000;//距离结束的毫秒数
- // 获取天、时、分、秒
- let day = parseInt(time / (60 * 60 * 24));
- let hou = parseInt(time % (60 * 60 * 24) / 3600);
- let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
- let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
- day = that.timeFormin(day),
- hou = that.timeFormin(hou),
- min = that.timeFormin(min),
- sec = that.timeFormin(sec)
- that.setData({
- day: that.timeFormat(day),
- hou: that.timeFormat(hou),
- min: that.timeFormat(min),
- sec: that.timeFormat(sec)
- })
- // 每1000ms刷新一次
- if (time>0){
- that.setData({
- countDown: true
- })
- setTimeout(this.countDown, 1000);
- }else{
- that.setData({
- countDown:false
- })
- }
- },
- //小于10的格式化函数(2变成02)
- timeFormat(param) {
- return param < 10 ? '0' + param : param;
- },
- //小于0的格式化函数(不会出现负数)
- timeFormin(param) {
- return param < 0 ? 0: param;
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/again/again.json b/pages/again/again.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/again/again.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/again/again.wxml b/pages/again/again.wxml
deleted file mode 100644
index 92aa2f0..0000000
--- a/pages/again/again.wxml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 距离投票结束还有
-
-
- {{day}}天 {{hou}}时{{min}}分{{sec}}秒
-
-
-
- {{tab_number}}人
- 参与者
-
-
- {{tab_vote}}票
- 投票数
-
-
- {{tab_visit}}次
- 访问量
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/again/again.wxss b/pages/again/again.wxss
deleted file mode 100644
index da39e56..0000000
--- a/pages/again/again.wxss
+++ /dev/null
@@ -1,102 +0,0 @@
-/* pages/sign/sign.wxss */
-.page-body{
- height: 300rpx;
- position: relative;
-}
-.swiper-item image{
- width: 100%;
- height: 300rpx;
-}
-.dots{
- display: inline-block;
- position: absolute;
- bottom: 20rpx;
- right: 0;
- padding: 0 20rpx;
-}
-.dots .dot{
- width: 8rpx;
- height: 8rpx;
- background: #fff;
- float: left;
- margin:0 4rpx;
- border-radius: 50%;
-}
-.dots .dot.active{
- background: #2a8de9;
-}
-.sign{
- padding: 0 40rpx;
- width: 100%;
-}
-.sign .list{
- margin-top: 40rpx;
- width: 100%;
-}
-.sign .list text{
- font-size: 30rpx;
-}
-.sign .list input,.sign .list textarea{
- width: 610rpx;
- height: 70rpx;
- border: none;
- background-color: #eeeeee;
- border-radius: 5rpx;
- margin-top: 10rpx;
- padding: 0 20rpx;
- font-size: 26rpx;
-}
-.sign .list textarea{
- height: 173rpx;
- padding-top: 20rpx;
-}
-.sign .list button:not([size='mini']){
- width: 570rpx;
- border-radius: 8rpx;
- background-color: #2a8de9;
- color: #fff;
- font-size: 30rpx;
- height: 74rpx;
-}
-.sign .list .img{
- margin-top:20rpx;
- display: inline-block;
- width: 100%;
- position: relative;
-}
-.sign .list image{
- width: 160rpx;
- height: 160rpx;
- float: left;
-}
-.sign .list .uploadimg{
- width: 160rpx;
- height: 160rpx;
- border: 2rpx solid #cacaca;
- position: relative;
-}
-.uploadopacity{
- opacity:0
-}
-.sign .list .uploadimg::after{
- width: 112rpx;
- height: 6rpx;
- background: #cacaca;
- content: "";
- position: absolute;
- left: 50%;
- margin-left: -56rpx;
- top: 50%;
- margin-top: -3rpx;
-}
-.sign .list .uploadimg::before{
- width: 6rpx;
- height: 112rpx;
- background: #cacaca;
- content: "";
- position: absolute;
- left: 50%;
- margin-left: -3rpx;
- top: 50%;
- margin-top: -56rpx;
-}
\ No newline at end of file
diff --git a/pages/canvasposter/canvasposter.js b/pages/canvasposter/canvasposter.js
index d0a820d..81c309b 100644
--- a/pages/canvasposter/canvasposter.js
+++ b/pages/canvasposter/canvasposter.js
@@ -11,6 +11,8 @@ const maskCanvas = wx.createCanvasContext('maskCanvas', this); // 创建 canvas
const util = require('../../utils/util.js');
var urlPath = require('../../config.js');
+const innerAudioContext = wx.createInnerAudioContext()
+var srcurl=`${urlPath.host}/static/media/bg_audio.mp3`;
Page({
/**
* 页面的初始数据
@@ -24,10 +26,9 @@ Page({
// titlelist: ['脸谱', '背景', '按钮', '川剧', '人物', '文字', '装饰'],
titlelist: [],
titleIndex: '-1',
- allList: [
- '../../img/background/1.png',
- ],
+ allList: [],
allIndex: '-1',
+ zancunImg:[],//缓存中的图片
isOk: false,
isNo: false,
closeTime: null,
@@ -39,7 +40,9 @@ Page({
creat_close:true,
currentIndex:0,
worksBox:false,
- isloading:false
+ isloading:false,
+ playAudio:false,
+ guiz:false
},
// 下一个
nextEv(){
@@ -74,6 +77,7 @@ Page({
closeWorks(){
this.setData({funBox:true,worksBox:false,creat_close:true})
},
+ // 标题点击事件
chooseTitle(e) {
if(this.data.isloading==false) {
let that = this;
@@ -89,6 +93,11 @@ Page({
currentIndex:0
})
this.getBottleWidgets(that.data.titlelist[that.data.titleIndex].id);
+ } else {
+ wx.showToast({
+ title:'正在加载...',
+ icon:'loading'
+ })
}
},
chooseImg(e) {
@@ -133,17 +142,22 @@ Page({
}
},
onShow: function() {
- if (typeof this.getTabBar === 'function' &&
- this.getTabBar()) {
+ if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 0
})
}
+ this.onmusicTap();
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
+ if(wx.getStorageSync('guiz')!=false) {
+ this.setData({
+ guiz:true
+ })
+ }
let that = this;
items = this.data.itemList;
wx.getSystemInfo({ // 获取系统信息
@@ -170,15 +184,15 @@ Page({
if (res.data.code == 0) {
wx.setStorageSync('token', res.data.data.token);
wx.setStorageSync('username', res.data.data.user.wx_name);
- that.setBackGroundImg({
- url: '../../img/background/3.png'
- });
that.getBottleCategories();
}
}
});
}
})
+ that.setBackGroundImg({
+ url: '../../img/background/3.png'
+ });
},
// 上传图片
uploadImg() {
@@ -497,8 +511,6 @@ Page({
canvasTemImg: res.tempFilePath
})
if(whereIndex==1){
- wx.showToast({title:'正在调起分享',duration:5000})
- console.log(this.data.canvasTemImg);
wx.uploadFile({
url: urlPath.composeBottle,
filePath: this.data.canvasTemImg,
@@ -517,6 +529,10 @@ Page({
wx.downloadFile({
url: urlPath.host + newRes.data.src,
success: (res) => {
+ wx.hideToast();
+ this.setData({
+ times:0
+ })
wx.showShareImageMenu({
path: res.tempFilePath,
success:(res)=>{}
@@ -606,7 +622,11 @@ Page({
},
// 首页左下角分享
homeShare(){
- this.synthesis(1);
+ if(this.data.times==0){
+ wx.showToast({title:'正在调起分享',duration:50000})
+ this.data.times++
+ this.synthesis(1);
+ }
},
// 分享图片
shareImg(e) {
@@ -616,7 +636,7 @@ Page({
times:this.data.times++
})
if(newIndex==0){
- wx.showToast({title:'正在调起分享',duration:5000})
+ wx.showToast({title:'正在调起分享',duration:50000})
}
wx.uploadFile({
url: urlPath.composeBottle,
@@ -634,10 +654,13 @@ Page({
let newRes = JSON.parse(res.data);
if(newRes.code==0){
if(newIndex==0){
- console.log(newIndex);
wx.downloadFile({
url: urlPath.host + newRes.data.src,
success: (res) => {
+ wx.hideToast();
+ this.setData({
+ times:0
+ })
wx.showShareImageMenu({
path: res.tempFilePath,
success:(res)=>{}
@@ -712,8 +735,6 @@ Page({
avater: this.data.userInfo.avatarUrl,
},
success:(res)=> {
- console.log(this.data.userInfo.nickName,);
- console.log(res);
if (res.data.code == 0) {
wx.setStorageSync('token', res.data.data.token);
wx.setStorageSync('openid', res.data.data.openid);
@@ -747,6 +768,13 @@ Page({
titlelist: res.data.data
})
// this.getBottleWidgets(res.data.data[0].id);
+ let arrImg = [];
+ for (var i = 0; i < res.data.data.length; i++) {
+ arrImg.push([]);
+ }
+ this.setData({
+ zancunImg:arrImg
+ })
}
}
}
@@ -758,55 +786,94 @@ Page({
isloading:true,
allList: []
})
- wx.request({
- url: urlPath.getBottleWidgets,
- method: 'post',
- data: {
- category_id: id,
- size: 60
- },
- success: (res) => {
- if (res.data.code == 0) {
- if (res.data.data.length) {
- this.setData({
- haveData: true
- })
- let newArr = [];
- res.data.data.forEach(item => {
- let url = urlPath.host + item.img;
- this.downLoadImg(url, urlPath.host + item.img);
- let obj = {
- id: item.id,
- name: item.name,
- img: urlPath.host + item.img,
- img_thumb:urlPath.host + item.img_thumb,
- }
- newArr.push(obj)
- })
- this.setData({
- allList: newArr,
- })
- this.setData({
- isloading:false
- })
- } else {
- // wx.showToast({
- // title:'无内容',
- // icon:'none'
- // })
- this.setData({
- haveData: false
- })
+ if(this.data.zancunImg[this.data.titleIndex].length==0){
+ wx.request({
+ url: urlPath.getBottleWidgets,
+ method: 'post',
+ data: {
+ category_id: id,
+ size: 60
+ },
+ success: (res) => {
+ if (res.data.code == 0) {
+ if (res.data.data.length) {
+ this.setData({
+ haveData: true
+ })
+ let newArr = [];
+ res.data.data.forEach(item => {
+ let url = urlPath.host + item.img;
+ this.downLoadImg(url, urlPath.host + item.img);
+ let obj = {
+ id: item.id,
+ name: item.name,
+ img: urlPath.host + item.img,
+ img_thumb:urlPath.host + item.img_thumb,
+ }
+ newArr.push(obj)
+ })
+ this.data.zancunImg[this.data.titleIndex] = newArr;
+ this.setData({
+ zancunImg:this.data.zancunImg
+ })
+ this.setData({
+ allList: newArr,
+ isloading:false
+ })
+ } else {
+ this.setData({
+ haveData: false,
+ isloading:false
+ })
+ }
+
}
-
}
- }
- });
+ });
+ } else {
+ this.setData({
+ allList: this.data.zancunImg[this.data.titleIndex],
+ isloading:false,
+ haveData: true
+ })
+ }
},
// 查看我的作品
checkWorkEv() {
wx.navigateTo({
url: '/pages/works/works'
})
+ },
+ onmusicTap: function (event) {
+ // var srcurl="http://ws.stream.qqmusic.qq.com/C400003ve1uC4XLn3d.m4a?guid=689499762&vkey=B1D022604613407E7D095A017630F160F652877AAD8834515F05D5777E57F7F08467145E6879B04A2694BA6B7CD82AB028B7C2635D21F49B&uin=&fromtag=66"
+ innerAudioContext.autoplay = true
+ innerAudioContext.src = srcurl
+ innerAudioContext.onPlay(() => {
+ console.log('开始播放')
+ this.setData({
+ playAudio:false
+ })
+ })
+ },
+ onHide(){
+ this.closeAudio()
+ },
+ playAudio(){
+ innerAudioContext.play();
+ this.setData({
+ playAudio:false
+ })
+ },
+ closeAudio(){
+ innerAudioContext.pause();
+ this.setData({
+ playAudio:true
+ })
+ },
+ closeTank(){
+ wx.setStorageSync('guiz',false);
+ this.setData({
+ guiz:false
+ })
}
})
diff --git a/pages/canvasposter/canvasposter.wxml b/pages/canvasposter/canvasposter.wxml
index c653985..01d6b1a 100644
--- a/pages/canvasposter/canvasposter.wxml
+++ b/pages/canvasposter/canvasposter.wxml
@@ -44,13 +44,18 @@
创建作品
- 作品
- 规则
-
+
+ 活动规则
+
+
+
+ 参加活动
-
-
+
+ 关闭音乐
+ 开启音乐
@@ -74,8 +79,8 @@
- 无内容
-
+ 无内容
+
@@ -119,4 +124,27 @@
+
+
+
+
+ DIY“丰谷酒王”游戏规则:
+ 您可以为亲人、朋友、爱人专属定制的换装小游戏,点击背景、人物、文字和装饰,将这些素材拖动到“丰谷酒王”瓶身上随意DIY,换装完成后,点击下载,即可自动生成专属的“丰谷酒王”海报图。让您在元旦佳节给朋友送上最浓烈的专属祝福,使你们的有情更有情。
+ 活动期间(2022年1月1日-3日),参与此游戏并下载生成专属“丰谷酒王”图,你的DIY图片将会自动参与到作品投票环节,获得票数最多的前十名用户,会获得丰谷好礼。
+
+ 第一名“丰谷壹号”1瓶(价值968元)
+ 第二名“丰谷酒王”2瓶(价值876)
+ 第三名“丰谷酒王”1瓶(价值438元)
+ 第四至六“丰谷墨渊”1件6瓶(价值350元)
+ 第七至十“丰谷墨渊”2瓶(价值116元)
+
+ 投票规则
+ 1. 进行3轮线上网友投票,每次在所有参赛作品中选出前20张DIY作品入围决赛,并进行线下展出;
+ 2. 每个ID限制投票1次;
+ 3. 每个微信帐号只能投稿一次,同一作者用不同帐号多次投稿,取最高获票名次;
+ 4. 每次投票时间为期3天,逾期将不可投票;
+ 5. 最终解释权归鑫焱探索科技有限公司所有;
+ 6.整个投票截止时间为2022年1月3日23点59分结束。
+ X
+
\ No newline at end of file
diff --git a/pages/canvasposter/canvasposter.wxss b/pages/canvasposter/canvasposter.wxss
index 0a88490..2e1096c 100644
--- a/pages/canvasposter/canvasposter.wxss
+++ b/pages/canvasposter/canvasposter.wxss
@@ -74,20 +74,25 @@
.touchActive {
z-index: 400;
}
-
.operation-buttons {
position: absolute;
- bottom: 110rpx;
+ top: 0rpx;
right: 15rpx;
display: flex;
flex-direction: column;
z-index: 101;
transition: all .5s ease-in-out;
}
-
-.operation-buttons view {
+.decimalNum{
+ list-style: decimal;
+}
+.operation-buttons .new-box {
width: 51px;height: 51px;background-color: #2a7be9;border-radius: 50%;color: #fff;display: flex;justify-content: center;align-items: center;margin-top: 40rpx;
}
+.quan {
+ display: flex;justify-content: center;align-items: center;flex-direction: column;
+ font-size: 24rpx;
+}
.operation-buttons image {
width: 27px;height: 25px;margin-top: 0px;
}
@@ -223,8 +228,10 @@ scroll-view {
swiper {
padding-bottom: 20rpx;
}
+.nothing {width: 100%;height: 320rpx; color: rgba(255,255,255,.5);display: flex;justify-content: center;align-items: center;}
+.pre-next-box {position: fixed;z-index: 0;bottom: 280rpx;left: 0;right: 0;display: flex;justify-content: space-between;}
.creat-works-btn {position: fixed;bottom: 110rpx;left: 77px;right: 77px; height: 51px;line-height: 51px;text-align: center;color: #fff;background-color: #287be9;border-radius: 51px;z-index: 101;box-sizing: border-box;font-weight: bold;}
-.works-box {position: fixed;bottom: 110rpx;z-index: 101;}
+.works-box {position: fixed;bottom: 110rpx;z-index: 101;left: 0;right: 0;}
.works-boxAc {bottom: 86rpx;}
.close-works-btn {background-color: #2a7be9;color: #fff;border-radius: 20px 20px 0 0;padding: 50rpx 20rpx 30rpx 20rpx;display: inline-block;}
.works-content {background-color: #2a7be9;}
@@ -338,3 +345,6 @@ swiper {
.isNyin{box-shadow: 0rpx 3rpx 6rpx rgba(0,0,0,.5);}
.isOyin{box-shadow: 0rpx 3rpx 6rpx rgba(0,0,0,1);}
.card-box-userinfo {transform: rotate(360deg) scale(0);transition: all 1s ease-in-out;}
+.guiz {position: fixed;top: 0;left: 0;right: 0;bottom: 80rpx;background-color: rgba(0,0,0,.5);display: flex;justify-content: center;align-items: center;z-index: 10000;padding: 60rpx;}
+.guiz-box {background-color: rgba(255,255,255,1);border-radius: 20rpx;padding: 20rpx;font-size: 24rpx;color: #333;line-height: 40rpx;position: relative;}
+.close-btn {width: 30rpx;height: 30rpx;display: flex;justify-content: center;align-items: center;background-color: #2a7be9;color: #fff;border-radius: 50%;padding: 30rpx;font-size: 30rpx;position: absolute;right: -20rpx;top: -20rpx;}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index e5f7137..5a8226f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -5,12 +5,12 @@ Page({
// 前往下一页
picture(e) {
wx.navigateTo({
- url: '../picture/picture?id=' + e.currentTarget.dataset.id
+ url: '/pagesA/pages/picture/picture?id=' + e.currentTarget.dataset.id
});
},
rule() {
wx.navigateTo({
- url: '../rule/rule'
+ url: '/pagesA/pages/rule/rule'
});
},
vote(e){
@@ -48,11 +48,11 @@ Page({
},
personal(e) {
wx.navigateTo({
- url: '../personal/personal?id=' + e.currentTarget.dataset.uid
+ url: '/pagesA/pages/personal/personal?id=' + e.currentTarget.dataset.uid
});
},
sign() {
- wx.navigateTo({ url: '../sign/sign' });
+ wx.navigateTo({ url: '/pagesA/pages/sign/sign' });
},
/**
* 页面的初始数据
@@ -89,52 +89,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- var that = this;
- that.setData({
- //倒计时数据
- endTime: '',
- tab_number: 0 ,//参与者
- tab_vote: 0,//投票数
- tab_visit: 0,//访问次数
- rule_text:['1、本次活动不收任何费用,不退稿。2、参赛作品需附有作品介绍,字数限100字以内。3、每位参赛者仅限提交不超过5幅3、每位参赛者仅限提交不超过5幅'],//活动规则
- //列表
- works_list: [],
- pageSize : 20,
- });
- //登录状态
- wx.checkSession({
- success: function (res) {
- that.getSlideList();
- that.saveVisit();
- that.getBaseInfo();
- //var user = wx.getStorageSync('user') || [];
- },
- fail: function(){
- wx.login({
- success: res => {
- wx.request({
- url: urlPath.getopenid,
- data: {
- code: res.code
- },
- success(res) {
- if(res.data.code == 0){
- wx.setStorageSync('token', res.data.data.token);
- wx.setStorageSync('openid', res.data.data.openid);
- wx.setStorageSync('user', res.data.data.user);
- that.onLoad();
- }else{
- console.log(res.data.msg);
- }
- }
- });
- }
- })
- }
- });
-
-
- //that.countDown()//倒计时监听
+ this.getBaseInfo();
},
saveVisit:function(){
wx.request({
@@ -346,6 +301,7 @@ Page({
rule: vote.rule
});
wx.setStorageSync('baseInfo', res.data.data);
+ console.log(wx.getStorageSync('baseInfo'),'数据');
that.countDown()
}else{
console.log(res.data.msg); //失败
@@ -377,7 +333,7 @@ Page({
var items = res.data.data.items;
if(type== 'int'){
wx.navigateTo({
- url: '../picture/picture?id=' + items.id
+ url: '/pagesA/pages/picture/picture?id=' + items.id
});
}else if(type == 'string'){
var vote_list = [];
diff --git a/pages/picture/picture.json b/pages/picture/picture.json
deleted file mode 100644
index ccfc528..0000000
--- a/pages/picture/picture.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {
- "mp-tabbar": "../../custom-tab-bar/index"
- }
-}
\ No newline at end of file
diff --git a/pages/ranking/ranking.js b/pages/ranking/ranking.js
index 1975650..9658ee3 100644
--- a/pages/ranking/ranking.js
+++ b/pages/ranking/ranking.js
@@ -13,15 +13,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- var that = this;
- that.getList();
+
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
-
+ var that = this;
+ that.getList();
},
/**
diff --git a/pages/ranking/ranking.wxml b/pages/ranking/ranking.wxml
index 183f1ed..1c8983d 100644
--- a/pages/ranking/ranking.wxml
+++ b/pages/ranking/ranking.wxml
@@ -20,7 +20,7 @@
{{item.ranks}}
- {{item.name}}
+ {{item.name}}
{{item.ids}}号
diff --git a/pages/ranking/ranking.wxss b/pages/ranking/ranking.wxss
index c68597c..2076024 100644
--- a/pages/ranking/ranking.wxss
+++ b/pages/ranking/ranking.wxss
@@ -50,36 +50,38 @@
.ranking .ranking-th{
background: #f7f7f7;
width: 100%;
- display: inline-block;
+ display: flex;
vertical-align:top;
+ padding: 20rpx;
}
.ranking .ranking-th view{
float: left;
display: inline-block;
font-size: 28rpx;
- padding: 20rpx 0 20rpx 20rpx ;
color: #a8a8a8;
}
.ranking .ranking-list {
- display: inline-block;
+ display: flex;
vertical-align:top;
width: 100%;
border-bottom: 1rpx solid #dddddd;
+ padding: 20rpx;
}
.ranking .ranking-th view:nth-child(1),.ranking .ranking-list view:nth-child(1){
- width: 200rpx;
+ width: 12%;
}
.ranking .ranking-th view:nth-child(2),.ranking .ranking-list view:nth-child(2){
- width: 180rpx;
+ width: 48%;
}
.ranking .ranking-th view:nth-child(3),.ranking .ranking-list view:nth-child(3){
- width: 270rpx;
+ width: 25%;
}
.ranking .ranking-th view:nth-child(4),.ranking .ranking-list view:nth-child(4){
- width: 100rpx;
+ width: 30%;
text-align: center;
padding-left: 0rpx;
}
+.clips1{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
.ranking .ranking-list .ranks text{
font-size: 40rpx;
color: #fc7e21;
@@ -87,7 +89,7 @@
height: 94rpx;
text-align: center;
display: block;
- margin-left: 20rpx;
+ margin-left: 10rpx;
}
.ranking .ranking-list:nth-child(1) .ranks text{
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAyCAYAAAAus5mQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyVpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ2MCwgMjAyMC8wNS8xMi0xNjowNDoxNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjIgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RENCRDE0REFGNTg0MTFFQTlGQUJCMUNBNzVBQjE4NTQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RENCRDE0REJGNTg0MTFFQTlGQUJCMUNBNzVBQjE4NTQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpEQ0JEMTREOEY1ODQxMUVBOUZBQkIxQ0E3NUFCMTg1NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpEQ0JEMTREOUY1ODQxMUVBOUZBQkIxQ0E3NUFCMTg1NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsTSRPIAAAW6SURBVHjaxFlbbBRVGP53dmcvLdsL0lppa0VaLSI1NSgPXmgxBhQejNiaiPLkgxBrDBpJiERfNDEaE6JREp6M+KAQNNEEgreKL3hJi6Sm2kakNy7Fttvbdq+zfv/saTtzOnttd/dPvmw7c+Z83/znP/855x/beFcHZWEKcC/wCLAZuAOoAYrF/VlgGOgDfge+B7oALVMiR4btbwH2A3uBW5O0cwGrgSbgKXFtEPgE+Bi4mokn0rEy4AhwCXg9hbhExs8cFn0cEX2m78Hyfz6wbDCxvuMJ8dZVtDLmBl4C2oF94P3KgjP1EKORHT/vAAcA25IGsSipc0Ok+gfJHhojJTxJNi0Uv6U4SVNLKeq8icKeWgoXwXk2u9wDv/Ap8LyP34MQGk07BvGQEz+fGeJnMSYiM+T2dZNzuheCgpYvx9eVyDQ55obJNfkHBLso5N1AgbJm0hyrTE2BV4A6cO6ByFDKGBSeO75EXEwj98RvVDL4KUgvJBSXSDA/w89yH9yXZMx1XHCn9CAPa5vsteLrp8kRuLas4LPFIuQZP4+wuEyzNz8me7NNzPRXE3oQb7BTxNxiA8SWd+TkssWZvIK+uE/uW7ID0LDL9FKGRO0FeoFqo+e8Iyf031wYe3C6uk32JHtiA+CTPXjYKI7jpPj6mZyJWwydM3JMVolcaxpiXiFeNCUrXxeG4irl2piDuSTbLzQtCHwe8JhSCc+2PBlzSSPlEZoWBO41LaST3fqMy5cxF3NK9ty8wHuAeuMK4ZrqpXybzhkzLSYNrI0Fthqv8tKVSRJeMS+Ck7kla2GB95sEYn0tlFlwb2GBjcYr9uCNggm04G5UTLlPXzl8BRNowV2jiBXEEAuhggm04PayQNW8/9EKJ3Apt8oCTRkyZlMLJtCCe5oFjpoXcG/BBFpwj7LAfuMV3qYXyiy4+1hgj/FKxLO2YAItuP9kgeeMV8JFt1mekfIxReLcJjvHAn8EpoybSP0UlmdjTmnjypp+YIFzwEnjnUD55rwLtOBkTYH57dYxUyy411K4+Pb8eQ9czCnZMeN+8Dxw1njXv2Yrxezu3Oc+cDCXZGeFJtOZhA/QYWMszlY+muMJY9M5pNjjTeHBJcdOnOo53bwnz2h/RWuORNrIX7nNaua+C1xIVFl4c9618xYs2YhD9g4sQ46VG1b0xX0GvXfJt5j7jYQHd1Eb4RP+sPF6aFU9Tde0U9RVsfzVAn1wX9ynZMzZJtdnltRm0IAbbgNG5GVoqrpdH/Js1mt+hp/lPiyWNOZqFdypq1to2D+xvuMB/HlanPJF2CgY8rv1oVH9A+Sc6dMrWErUby3KXoTlqwbeaojHms2yXsontMfBeTnt8psQOQCRfF45Cuwxx7eC3LVOh/5vdI7sXB+MhRe2TVG1FCnEk8qxXOJ7AVwJyxdJI58f1D7fdCjcsOaZwPZ6m1biTpDLPBRJLWYxrqYC5O78t8+18btnU1YeDJUtywal1Llb7f/Ppl4ap1BTFQW31JK22pPVBFHG58j1yxA5L15DUGsNWs+m2slDLUNpCUxiO+OzRCNn9xUd0eoSCjdWUKSujKKVSLJKgjypxcg+OkOOAR+pf90g+8iUORHG+z6atcDStzs5xT+45HgIogUyu0JamZu0EhfF1HiB1BaOYhiDpPgC+oslse3LEiiqDq7kiU0jZcyvIwtrhRNUDHM4cd0mFlsckbYm+f5HwL4c7xceBn5eiNMTFylporYYglzbjqQTK8m9OiDTTWGPvJanYQ9lK/C+DIn4o+Eu4fUvM3iumadaNgKb0yTgL5tcU+alcUCcJZ4Enqb4Z4VUxpliXTYCU52c+CzDHwX5U+xbvOmR7n8B3Al0pCG0JhuBpQmu80H/NaAWeBm4kuwsBHwoYnk38I3Fi5BcH0o3D34LtHB9BPgb+An4muIfpjPeBgKnBMrFdm6rED4G/Jrowf8FGABQFe50buzSYwAAAABJRU5ErkJggg==) no-repeat center;
@@ -112,7 +114,7 @@
}
.ranking .ranking-list view{
float: left;
- display: inline-block;
+ /* display: inline-block; */
padding: 0;
height: 94rpx;
line-height: 94rpx;
diff --git a/pages/user/user.js b/pages/user/user.js
index c2ff692..a3d2540 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -3,10 +3,10 @@ var urlPath = require('../../config.js');
Page({
// 前往下一页
picture() {
- wx.navigateTo({ url: '../picture/picture' });
+ wx.navigateTo({ url: '/pagesA/pages/picture/picture' });
},
again() {
- wx.navigateTo({ url: '../sign/sign' });
+ wx.navigateTo({ url: '/pagesA/pages/sign/sign' });
},
/**
* 页面的初始数据
@@ -34,10 +34,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- var that = this;
- var user = wx.getStorageSync('user');
- console.log(user);
- that.getImgs();
+
},
//小于10的格式化函数(2变成02)
timeFormat(param) {
@@ -51,7 +48,9 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
-
+ var that = this;
+ var user = wx.getStorageSync('user');
+ that.getImgs();
},
/**
diff --git a/pages/auth/auth.js b/pagesA/pages/auth/auth.js
similarity index 86%
rename from pages/auth/auth.js
rename to pagesA/pages/auth/auth.js
index ee531ef..47c912a 100644
--- a/pages/auth/auth.js
+++ b/pagesA/pages/auth/auth.js
@@ -8,7 +8,7 @@ Page({
success: (res) => {
if (res.authSetting['scope.userInfo']) {
wx.reLaunch({
- url: '../index/index',
+ url: '/pages/index/index',
})
}
}
diff --git a/pages/auth/auth.json b/pagesA/pages/auth/auth.json
similarity index 100%
rename from pages/auth/auth.json
rename to pagesA/pages/auth/auth.json
diff --git a/pages/auth/auth.wxml b/pagesA/pages/auth/auth.wxml
similarity index 70%
rename from pages/auth/auth.wxml
rename to pagesA/pages/auth/auth.wxml
index 453bbc3..748bcb4 100644
--- a/pages/auth/auth.wxml
+++ b/pagesA/pages/auth/auth.wxml
@@ -3,5 +3,5 @@
微信授权页面
此页面是微信授权页面,点击下方按钮弹出授权或跳转页面
- 已经授权点击调转
+ 已经授权点击调转
\ No newline at end of file
diff --git a/pages/auth/auth.wxss b/pagesA/pages/auth/auth.wxss
similarity index 100%
rename from pages/auth/auth.wxss
rename to pagesA/pages/auth/auth.wxss
diff --git a/pages/personal/personal.js b/pagesA/pages/personal/personal.js
similarity index 93%
rename from pages/personal/personal.js
rename to pagesA/pages/personal/personal.js
index 19e514f..6588268 100644
--- a/pages/personal/personal.js
+++ b/pagesA/pages/personal/personal.js
@@ -1,9 +1,10 @@
// pages/picture/picture.js
+var urlPath = require('../../../config.js');
Page({
// 前往下一页
picture() {
- wx.navigateTo({ url: '../picture/picture' });
+ wx.navigateTo({ url: '/pagesA/pages/picture/picture' });
},
/**
* 页面的初始数据
@@ -15,8 +16,8 @@ Page({
interval: 3000,
duration: 800,
//数据
- name:"王凯杰",
- nm_number:"237",
+ name:"",
+ nm_number:"",
//列表
works_list:[],
user_id:''
@@ -45,7 +46,7 @@ Page({
getUserProduction:function(userId){
var that = this;
wx.request({
- url: wx.getStorageSync('urlPath').getUserProduction,
+ url: urlPath.getUserProduction,
header:{
'token' : wx.getStorageSync('token')
},
@@ -56,7 +57,6 @@ Page({
if(res.data.code == 0){
if(res.data.data.length > 0){
var vote_list = [];
- var urlPath = wx.getStorageSync('urlPath');
res.data.data.forEach(function(item){
vote_list.push({
ids: item.id,
@@ -78,7 +78,7 @@ Page({
getUserInfo:function(userId){
var that = this;
wx.request({
- url: wx.getStorageSync('urlPath').getUserById,
+ url: urlPath.getUserById,
header:{
'token' : wx.getStorageSync('token')
},
@@ -87,7 +87,6 @@ Page({
},
success(res){
if(res.data.code == 0){
- console.log(res.data.data);
that.setData({
name:res.data.data.name,
nm_number:res.data.data.allVoteNumber
@@ -191,7 +190,7 @@ Page({
var id = e.currentTarget.dataset.id;
if(id > 0){
wx.request({
- url: wx.getStorageSync('urlPath').vote,
+ url: urlPath.vote,
header:{
'token' : wx.getStorageSync('token')
},
diff --git a/pages/personal/personal.json b/pagesA/pages/personal/personal.json
similarity index 100%
rename from pages/personal/personal.json
rename to pagesA/pages/personal/personal.json
diff --git a/pages/personal/personal.wxml b/pagesA/pages/personal/personal.wxml
similarity index 77%
rename from pages/personal/personal.wxml
rename to pagesA/pages/personal/personal.wxml
index f1d2436..5cd42f5 100644
--- a/pages/personal/personal.wxml
+++ b/pagesA/pages/personal/personal.wxml
@@ -4,7 +4,7 @@
-
+
@@ -27,22 +27,16 @@
-
+
{{item.ids}}号
-
- 简介:{{item.text}}
-
-
- {{item.number}}
-
-
+ 简介:{{item.text}}
+ {{item.number}}
+
diff --git a/pages/personal/personal.wxss b/pagesA/pages/personal/personal.wxss
similarity index 100%
rename from pages/personal/personal.wxss
rename to pagesA/pages/personal/personal.wxss
diff --git a/pages/picture/picture.js b/pagesA/pages/picture/picture.js
similarity index 93%
rename from pages/picture/picture.js
rename to pagesA/pages/picture/picture.js
index 9b45837..5caf4ec 100644
--- a/pages/picture/picture.js
+++ b/pagesA/pages/picture/picture.js
@@ -1,12 +1,12 @@
// pages/picture/picture.js
-var urlPath = require('../../config.js');
+var urlPath = require('../../../config.js');
Page({
// 前往下一页
personal() {
- wx.navigateTo({ url: '../personal/personal' });
+ wx.navigateTo({ url: '/pagesA/pages/personal/personal' });
},
sign() {
- wx.navigateTo({ url: '../sign/sign' });
+ wx.navigateTo({ url: '/pagesA/pages/sign/sign' });
},
/**
* 页面的初始数据
@@ -25,10 +25,10 @@ Page({
tab_visit:55,//访问次数
//
ids:'22',
- img:'../../img/img_03.png',
+ img:'',
text:'擅长记录身边的人与事!',
- name:'王凯杰',
- number:'78',
+ name:'',
+ number:'',
},
swiperChange: function (e) {
// console.log(e);
@@ -43,6 +43,7 @@ Page({
onLoad: function (options) {
var that = this;
var baseInfo = wx.getStorageSync('baseInfo');
+ console.log(baseInfo);
that.setData({
tab_number: baseInfo.numberOfPeople,
tab_vote: baseInfo.voteNumber,
@@ -52,7 +53,6 @@ Page({
img_url:wx.getStorageSync('img_url'),
});
that.countDown();
- console.log(options);
that.getDetail(options.id);
},
// 倒计时
@@ -89,6 +89,9 @@ Page({
})
}
},
+ rule(){
+ wx.navigateTo({url:'/pagesA/pages/rule/rule'})
+ },
getDetail:function(id){
var that = this;
wx.request({
@@ -100,6 +103,7 @@ Page({
'id' : id
},
success(res){
+ console.log(res,'shuju1');
if(res.data.code == 0){
var item = res.data.data;
that.setData({
diff --git a/pagesA/pages/picture/picture.json b/pagesA/pages/picture/picture.json
new file mode 100644
index 0000000..65dfd45
--- /dev/null
+++ b/pagesA/pages/picture/picture.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "mp-tabbar": "../../../custom-tab-bar/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/picture/picture.wxml b/pagesA/pages/picture/picture.wxml
similarity index 95%
rename from pages/picture/picture.wxml
rename to pagesA/pages/picture/picture.wxml
index a774311..037bd2d 100644
--- a/pages/picture/picture.wxml
+++ b/pagesA/pages/picture/picture.wxml
@@ -4,7 +4,7 @@
-
+
@@ -47,7 +47,7 @@
{{ids}}号
-
+
{{item.time}}
-
+
正在参与活动
参与活动
diff --git a/pages/works/works.wxss b/pagesA/pages/works/works.wxss
similarity index 100%
rename from pages/works/works.wxss
rename to pagesA/pages/works/works.wxss
diff --git a/project.config.json b/project.config.json
index 2fa6c75..ff3b479 100644
--- a/project.config.json
+++ b/project.config.json
@@ -30,7 +30,7 @@
"disablePlugins": [],
"outputPath": ""
},
- "useIsolateContext": true,
+ "useIsolateContext": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],