diff --git a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js
index 4d1054f..7e97e07 100644
--- a/packageA/pages/my_service/appment_main.js
+++ b/packageA/pages/my_service/appment_main.js
@@ -52,6 +52,7 @@ Page({
window: [0, 0], //屏幕尺寸
write: [0, 0], //定位参数
scrolltop: 0,//据顶部距离
+ v:{},
},
//控制备注输入
check_text: function() {
@@ -659,6 +660,11 @@ Page({
is_textea: 1
})
th.query_project();
+
+ th.queryMultipleNodes();
+
+
+
},
//获取单个服务项目信息
query_project: function() {
@@ -816,5 +822,68 @@ Page({
// that.data.writesize = [res.width, res.height];
}).exec();
},
+
+ //开始拖拽
+ touchmove: function (e) {
+ var that = this,th=that;
+ var position = [e.touches[0].pageX - that.data.writesize[0] / 2, e.touches[0].pageY - that.data.writesize[1] / 2 - this.data.scrolltop];
+ that.setData({
+ write: position
+ });
+
+ },
+
+
+ touchend:function(e){
+ var that = this,th=that;
+ var position =th.data.write;
+ for(var i=0;i<7;i++){
+ for(var j=0; j<2;j++){
+ //如果坐标在网格内
+ if( position[0]>th.data.f_x+i*th.data.f_width && position[0]
th.data.f_y +j*th.data.f_hei && position[1] {
+ console.log(res);
+ th.data.f_x=res[0].left;
+ th.data.f_y=res[0].top;
+ th.data.f_hei=res[0].height;
+ th.data.f_width=res[0].width;
+
+ })
+ },
+
+ getcopy:function(e){
+ var that=this;
+ var position = [e.detail.x - that.data.writesize[0] / 2, e.detail.y - that.data.writesize[1] / 2 - this.data.scrolltop];
+ that.setData({
+ write: position,copy_btn:1
+ });
+
+ }
+
})
\ No newline at end of file
diff --git a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml
index 4391abb..45eae66 100644
--- a/packageA/pages/my_service/appment_main.wxml
+++ b/packageA/pages/my_service/appment_main.wxml
@@ -27,16 +27,6 @@
8:00
9:00
- 10:00
- 11:00
- 12:00
- 13:00
- 14:00
- 15:00
- 16:00
- 17:00
- 18:00
- 19:00
@@ -60,76 +50,31 @@
200
200
-
- 张三
- 100
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
-
-
- 张三
- 100
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
- 200
-
- 张三
+
+ 张三
+ {{v[0][0]}}
+ {{v[0][1]}}
- 张三
- 100
- 200
+ 张三
+ {{v[1][0]}}
+ {{v[1][1]}}
- 张三
- 100
- 200
+ 张三
+ {{v[2][0]}}
+ {{v[2][1]}}
- 张三
- 100
- 200
-
-
- 1张三
- 300
- 300
-
-
- 张三
- 100
- 200
-
-
- 张三
- 100
- 200
+ 张三
+ {{v[3][0]}}
+ {{v[3][1]}}
+
1张三
300
@@ -162,17 +107,24 @@
1张三
+ 张三
300
300
+
+
+
+
项目1
+
+
项目2
@@ -330,4 +282,4 @@
-我可以移动
\ No newline at end of file
+项目1
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index c063e07..9fffebf 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -578,7 +578,7 @@
- {{item.content?item.content:''}}
+ {{item.content?item.content:'此用户没有填写评价。'}}
全部显示
diff --git a/pages/user/add_comment/add_comment.js b/pages/user/add_comment/add_comment.js
index 2d02b6b..ae5369c 100644
--- a/pages/user/add_comment/add_comment.js
+++ b/pages/user/add_comment/add_comment.js
@@ -88,8 +88,8 @@ Page({
var a = this;
if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
return getApp().my_warnning("请先打分",0,a);
- if(a.data.content=="")
- return getApp().my_warnning("请填写评价内容",0,a);
+ // if(a.data.content=="")
+ // return getApp().my_warnning("请填写评价内容",0,a);
//this.uploadPhotos(function () {
var p_data= {