|
@@ -13,7 +13,7 @@ Page({
|
|
|
left: 286,
|
|
|
width: 270,
|
|
|
height: 270,
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
propSize: {
|
|
|
top: '8cm',
|
|
@@ -21,30 +21,34 @@ Page({
|
|
|
bottom: '8cm',
|
|
|
left: '8cm',
|
|
|
},
|
|
|
- host:null,
|
|
|
+ host: null,
|
|
|
obverseImgObject: {
|
|
|
- '1': '/customized/images/customized/cup_black_big.png',/*正面 */
|
|
|
- '2': '/customized/images/customized/cup_black_side.png',/*侧面面 */
|
|
|
- '3': '/customized/images/customized/cup_black_handle.png',/*手柄 */
|
|
|
- '4': '/customized/images/customized/cup_black_bottom.png',/*底部 */
|
|
|
+ '1': '/customized/images/customized/cup_black_big.png',
|
|
|
+ /*正面 */
|
|
|
+ '2': '/customized/images/customized/cup_black_side.png',
|
|
|
+ /*侧面面 */
|
|
|
+ '3': '/customized/images/customized/cup_black_handle.png',
|
|
|
+ /*手柄 */
|
|
|
+ '4': '/customized/images/customized/cup_black_bottom.png',
|
|
|
+ /*底部 */
|
|
|
},
|
|
|
fontContent: '可定制区域',
|
|
|
madeImg: null, // 定制图
|
|
|
madeStatic: false, // 定制状态,表示是否已经定制了,false 表示没有定制
|
|
|
- animationData: {},//旋转动画
|
|
|
- imageArray:[],//请求数据后的图片列表
|
|
|
+ animationData: {}, //旋转动画
|
|
|
+ imageArray: [], //请求数据后的图片列表
|
|
|
imageId: null, // 用户选中图片的id
|
|
|
- imageSrc:null, // 选中图片后的路径
|
|
|
- touch:{
|
|
|
+ imageSrc: null, // 选中图片后的路径
|
|
|
+ touch: {
|
|
|
isActive: '1', // 1表示是正面
|
|
|
src: null,
|
|
|
- x:0,
|
|
|
- y:0,
|
|
|
- clientX:0,
|
|
|
- clientY:0,
|
|
|
- width:null, // 图片的宽度
|
|
|
- height:null,
|
|
|
- scale:1, // 图片宽高比例
|
|
|
+ x: 0,
|
|
|
+ y: 0,
|
|
|
+ clientX: 0,
|
|
|
+ clientY: 0,
|
|
|
+ width: null, // 图片的宽度
|
|
|
+ height: null,
|
|
|
+ scale: 1, // 图片宽高比例
|
|
|
angle: 0, // 旋转度数
|
|
|
}
|
|
|
},
|
|
@@ -57,28 +61,28 @@ Page({
|
|
|
that.animation = wx.createAnimation({
|
|
|
timingFunction: 'step-start', // "linear","ease","ease-in","ease-in-out","ease-out","step-start","step-end"
|
|
|
})
|
|
|
- if('id' in options){
|
|
|
+ if ('id' in options) {
|
|
|
let cupNum = util.changeCup(options.id);
|
|
|
let madeTouchImg = wx.getStorageSync('madeCupImgData' + options.id);
|
|
|
- if (madeTouchImg){
|
|
|
+ if (madeTouchImg) {
|
|
|
that.animation.rotate(madeTouchImg.angle).step();
|
|
|
that.setData({
|
|
|
touch: madeTouchImg,
|
|
|
animationData: this.animation.export(),
|
|
|
dataPositionObj: cupNum.dataPositionObj,
|
|
|
propSize: cupNum.propSize,
|
|
|
- madeStatic:true,
|
|
|
+ madeStatic: true,
|
|
|
});
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
that.setData({
|
|
|
'touch.isActive': options.id,
|
|
|
dataPositionObj: cupNum.dataPositionObj,
|
|
|
propSize: cupNum.propSize
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -88,9 +92,9 @@ Page({
|
|
|
onReady: function () {
|
|
|
let that = this;
|
|
|
that.setData({
|
|
|
- host:host,
|
|
|
+ host: host,
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -152,19 +156,19 @@ Page({
|
|
|
|
|
|
// console.log(this.data.touch)
|
|
|
},
|
|
|
- imgDelete(){ // 图片删除
|
|
|
+ imgDelete() { // 图片删除
|
|
|
let that = this;
|
|
|
that.setData({
|
|
|
'touch.src': null,
|
|
|
madeStatic: false, // 表示已经有图片
|
|
|
})
|
|
|
},
|
|
|
- imgEnlarge(e){
|
|
|
+ imgEnlarge(e) {
|
|
|
let that = this;
|
|
|
- console.log(e.detail.value,'eee')
|
|
|
+ console.log(e.detail.value, 'eee')
|
|
|
that.setData({
|
|
|
'touch.width': e.detail.value,
|
|
|
- 'touch.height': e.detail.value/that.data.touch.scale
|
|
|
+ 'touch.height': e.detail.value / that.data.touch.scale
|
|
|
})
|
|
|
},
|
|
|
imgRotate(e) { // 旋转
|
|
@@ -174,32 +178,33 @@ Page({
|
|
|
'touch.angle': e.detail.value
|
|
|
})
|
|
|
},
|
|
|
- getImgList(){ // 根据userid 获取图片列表
|
|
|
+ getImgList() { // 根据userid 获取图片列表
|
|
|
// /queryCustomGoodsUserListByUserId
|
|
|
wx.showLoading({
|
|
|
title: '加载中...',
|
|
|
- icon:'none'
|
|
|
+ icon: 'none'
|
|
|
})
|
|
|
let that = this
|
|
|
wx.request({
|
|
|
- url: host +'/queryCustomGoodsImg',
|
|
|
- // data:{
|
|
|
- // userId: app.globalData.user_id,
|
|
|
- // },
|
|
|
- type:'get',
|
|
|
- success(res){
|
|
|
- console.log(res,'图片列表请求结束')
|
|
|
+ url: host + '/queryImgListByPlaceIdAndGoodsId',
|
|
|
+ data: {
|
|
|
+ customGoodsId: 1, // 商品id
|
|
|
+ customGoodsImgPlaceId: that.data.touch.isActive * 1 - 1
|
|
|
+ },
|
|
|
+ type: 'get',
|
|
|
+ success(res) {
|
|
|
+ console.log(res, '图片列表请求结束')
|
|
|
that.setData({
|
|
|
- imageArray:res.data
|
|
|
+ imageArray: res.data
|
|
|
})
|
|
|
},
|
|
|
- complete(){
|
|
|
+ complete() {
|
|
|
wx.hideLoading()
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
- uploadImg(){
|
|
|
+ uploadImg() {
|
|
|
console.log('点击上传图片');
|
|
|
let that = this;
|
|
|
wx.chooseImage({
|
|
@@ -212,27 +217,27 @@ Page({
|
|
|
formData: {
|
|
|
file: tempFilePaths[0],
|
|
|
userId: app.globalData.user_id,
|
|
|
- imgStatus:0,// 表示素材
|
|
|
+ imgStatus: 0, // 表示素材
|
|
|
},
|
|
|
success(res) {
|
|
|
- console.log(res,'我上传完了')
|
|
|
+ console.log(res, '我上传完了')
|
|
|
that.getImgList()
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- selectImgBtn(e){
|
|
|
+ selectImgBtn(e) {
|
|
|
console.log('选中图片', e.currentTarget.dataset.id);
|
|
|
this.setData({
|
|
|
imageId: e.currentTarget.dataset.id,
|
|
|
imageSrc: e.currentTarget.dataset.src
|
|
|
})
|
|
|
// 'touch.src': e.currentTarget.dataset.src,
|
|
|
- // madeStatic: true, // 表示已经有图片
|
|
|
+ // madeStatic: true, // 表示已经有图片
|
|
|
// this.getScale(this, e.currentTarget.dataset.src);
|
|
|
},
|
|
|
- getScale(that,src){ // 获取图片的比例
|
|
|
+ getScale(that, src) { // 获取图片的比例
|
|
|
wx.getImageInfo({
|
|
|
src: src,
|
|
|
success: function (res) {
|
|
@@ -246,9 +251,9 @@ Page({
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- addImg(){ // 添加图片
|
|
|
+ addImg() { // 添加图片
|
|
|
let that = this;
|
|
|
- if (that.data.imageSrc){
|
|
|
+ if (that.data.imageSrc) {
|
|
|
that.setData({
|
|
|
'touch.src': that.data.imageSrc,
|
|
|
madeStatic: true, // 表示已经有图片
|
|
@@ -261,10 +266,10 @@ Page({
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- madeConfirm(){
|
|
|
+ madeConfirm() {
|
|
|
// 确认设计
|
|
|
- if (this.data.madeStatic){ // 设计完成存储数据
|
|
|
- wx.setStorageSync('madeCupImgData'+this.data.touch.isActive, this.data.touch);
|
|
|
+ if (this.data.madeStatic) { // 设计完成存储数据
|
|
|
+ wx.setStorageSync('madeCupImgData' + this.data.touch.isActive, this.data.touch);
|
|
|
wx.navigateBack()
|
|
|
// wx.redirectTo({
|
|
|
// url: '/customized/pages/made/made?id=' + this.data.touch.isActive
|
|
@@ -272,8 +277,8 @@ Page({
|
|
|
} else {
|
|
|
wx.showToast({
|
|
|
title: '您还没有选择图片进行设计',
|
|
|
- icon:'none'
|
|
|
+ icon: 'none'
|
|
|
})
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
})
|