Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents e635d980 254f1eef
Showing 5 changed files with 38 additions and 213 deletions
packageA/pages/my_service/appment_main.js
packageA/pages/my_service/appment_main.wxml
packageA/pages/my_service/appment_main.wxss
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/add_comment/add_comment.js
@@ -44,14 +44,6 @@ Page({
     validay: "", //服务项目有效期
     is_sub: 0, //判断是否重复提交
     is_textea: 1, //备注是否是可输入
-		
-		
-		// 拖拽参数
-		writePosition: [80, 90], //默认定位参数
-		writesize: [0, 0],// X Y 定位
-		window: [0, 0], //屏幕尺寸
-		write: [0, 0], //定位参数
-		scrolltop: 0,//据顶部距离
   },
   //控制备注输入
   check_text: function() {
@@ -541,10 +533,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
-		
-		
-		
     var th = this;
     th.setData({
 			options,
@@ -755,66 +743,8 @@ Page({
 		  }
 	  })
-  },
-	
-	
-	
-	//计算默认定位值
-	   getSysdata: function () {
-	       var that = this;
-	       wx.getSystemInfo({
-	           success: function (e) {
-	               that.data.window = [e.windowWidth, e.windowHeight];
-	               var write = [];
-	               write[0] = that.data.window[0] * that.data.writePosition[0] / 100;
-	               write[1] = that.data.window[1] * that.data.writePosition[1] / 100;
-	               console.log(write,45)
-	               that.setData({
-	                   write: write
-	               }, function () {
-	                   // 获取元素宽高
-	                   wx.createSelectorQuery().select('.td').boundingClientRect(function (res) {
-	                       // console.log('0x0x',res.width)
-	                       that.data.writesize = [res.width, res.height];
-	                   }).exec();
-	               })
-	           },
-	           fail: function (e) {
-	               console.log(e)
-	           }
-	       });
-	   },
-	   //开始拖拽   
-	   touchmove: function (e) {
-			 // console.log(123);
-	       var that = this;
-	       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
-	       });
-				 this.getSysdata();
-	   },
-	   onPageScroll(e) {
-	       this.data.scrolltop = e.scrollTop;
-	   },
+  }
+  
-  scroll(e) {
-		// console.log('scroll', e);
-	},
-	
-	rect() {
-		// console.log('click');
-		// wx.createSelectorQuery().select('.td').boundingClientRect(function (res) {
-		//     console.log('0x0x',res);
-		// }).exec();
-	},
-	
-	print(e) {
-		console.log('e', e);
-		wx.createSelectorQuery().select('.td').boundingClientRect(function (res) {
-		    console.log('0x0x',res);
-		    // that.data.writesize = [res.width, res.height];
-		}).exec();
-	},
 })
 \ No newline at end of file
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container" catchtap="close">
   <image class="main" src="{{iurl}}/miniapp/images/yyservice/main.png"></image>
-	<!-- Fram -->
-  <view class="">
+
+  <view class="Fram">
     <!-- 选择门店 -->
-    <view class="flex-vertical pdv20 jc-center">
+    <view class="flex-vertical mabot">
       <!-- 门店 -->
       <view class="flex-vertical-between head fs30">
         <view>门</view>
@@ -17,120 +17,54 @@
         <view class="angle">∟</view>
       </view>
     </view>
-		
-		
-		<view class="table flex">
-			<view class="left t-c">
-				<view class="td">时间</view>
-				<view class="td">8:00</view>
-				<view class="td">9:00</view>
-			</view>
-			<scroll-view scroll-x class="right" bindscroll="scroll">
-				<view class="flex t-c" bindtap="rect">
-					<view bindtap="rect">
-						<view class="td blue">张三</view>
-						<view class="td" bindtap="print">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">张三</view>
-						<view class="td">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">张三</view>
-						<view class="td" bindtap="print">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">张三</view>
-						<view class="td">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">张三</view>
-						<view class="td">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">张三</view>
-						<view class="td">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">张三</view>
-						<view class="td">100</view>
-						<view class="td">200</view>
-					</view>
-					<view>
-						<view class="td blue">1张三</view>
-						<view class="td">300</view>
-						<view class="td">300</view>
-					</view>
-				</view>
-			</scroll-view>
-			<view class="card">
-				<view class="t-c pd20">
-					<text class="iconfont icon-meirong fs40"></text>
-					<view class="fs24">项目1</view>
-				</view>
-				<view class="t-c pd20">
-					<text class="iconfont icon-meirong fs40"></text>
-					<view class="fs24">项目1</view>
-				</view>
-			</view>
-		</view>
-		
-		
-		
     <!-- 选择美容师 -->
-    <!-- <view class="flex-vertical mabot"> -->
+    <view class="flex-vertical mabot">
       <!-- 门店 -->
-      <!-- <view class="flex-vertical-between head fs30">
+      <view class="flex-vertical-between head fs30">
         <view>美</view>
         <view>容</view>
         <view>师</view>
-      </view> -->
+      </view>
       <!-- 选择美容师 -->
-      <!-- <view class="rel fs26"> -->
-        <!-- <view class="flex-vertical-between Cosmetology" bindtap="query_beautician">
+      <view class="rel fs26">
+        <view class="flex-vertical-between Cosmetology" bindtap="query_beautician">
           <view class="{{beautician_name==''?'color':''}} value ellipsis-1">{{beautician_name==''?'选择美容师':beautician_name}}</view>
           <view class="angle">∟</view>
-        </view> -->
+        </view>
         <!-- 美容师下拉列表 -->
-        <!-- <view class="beauticians abs" wx:if="{{beautician}}"> -->
+        <view class="beauticians abs" wx:if="{{beautician}}">
           <!-- 到时候要做判断如果是index==循环的最后一个则把下边线去掉:(beaclone去掉的css) -->
-          <!-- <view class="beautician flex-vertical fs26" wx:for="{{beautician_list}}" bindtap="choice_beautician" data-baaindex="{{key}}" wx:for-index="key">
+          <view class="beautician flex-vertical fs26" wx:for="{{beautician_list}}" bindtap="choice_beautician" data-baaindex="{{key}}" wx:for-index="key">
             <view class="StaffName ellipsis-1">{{item.StaffName}}</view>
           </view>
           <view>
           </view>
-        </view> -->
-      <!-- </view> -->
-      <!-- <view class="flex-center users" bindtap="nav_bea">
+        </view>
+      </view>
+      <view class="flex-center users" bindtap="nav_bea">
         <image class="user" src="{{iurl}}/miniapp/images/yyservice/user.png"></image>
-      </view> -->
-    <!-- </view> -->
+      </view>
+    </view>
     <!-- 选择时间 -->
-    <!-- <view class="flex-vertical mabot"> -->
+    <view class="flex-vertical mabot">
       <!-- 门店 -->
-      <!-- <view class="head fs30">
+      <view class="head fs30">
         <view>预约时间</view>
-      </view> -->
+      </view>
       <!-- 选择时间 -->
-      <!-- <view class="flex-vertical-between fs26 select" data-url="/packageA/pages/my_service/beauty_deta?url={{url}}&StorageId={{StorageId}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto">
+      <view class="flex-vertical-between fs26 select" data-url="/packageA/pages/my_service/beauty_deta?url={{url}}&StorageId={{StorageId}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto">
         <view class="{{time==''?'color':''}}">{{time==""?'选择时间':time}}</view>
         <view class="angle angler">∟</view>
-      </view> -->
-    <!-- </view> -->
+      </view>
+    </view>
     <!-- 备注 -->
-    <!-- <view class="flex Remarks"> -->
+    <view class="flex Remarks">
       <!-- 门店 -->
-      <!-- <view class="flex-space-between head fs30">
+      <view class="flex-space-between head fs30">
         <view>备</view>
         <view>注</view>
       </view>
@@ -143,20 +77,20 @@
           <view class="textarea {{remarks==''?'color':''}}" bindtap="check_text">{{remarks==''?'填写备注':remarks}}
           </view>
         </block>
-      </view> -->
-    <!-- </view>
+      </view>
+    </view>
     <view wx:if="{{tment_count!=''}}" class="notes flex-level-right fs24 color">
       <view>注：剩余可预约人数{{tment_count}}人</view>
-    </view> -->
+    </view>
-    <!-- <view class="submitMax flex-space-center fs32"> -->
+    <view class="submitMax flex-space-center fs32">
       <!-- <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list">
         <view>我的预约</view>
       </navigator> -->
-      <!-- <form report-submit='true' bindtap="sub_success">
+      <form report-submit='true' bindtap="sub_success">
         <button form-type="submit" class="sub_appment flex-center">帮你预约</button>
-        </form> -->
-    <!-- </view> -->
+        </form>
+    </view>
   </view>
 </view>
@@ -213,6 +147,4 @@
 <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view>
 <warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
-<!-- <nav_b id="nav_b"></nav_b> -->
-
-<view bindtouchmove="touchmove" catch:touchmove style="position:absolute;left:{{write[0]}}px;top:{{write[1]}}px;">我可以移动</view>
 \ No newline at end of file
+<!-- <nav_b id="nav_b"></nav_b> -->
 \ No newline at end of file
@@ -286,40 +286,3 @@ button {
   height: 80rpx;
   color: rgb(159, 159, 159);
 }
-
-
-.table {
-	background-color: white;
-	border-top: 2rpx solid rgba(218, 217, 217, 1);
-	border-left: 2rpx solid rgba(218, 217, 217, 1);
-}
-.blue {
-	background: rgba(241, 252, 255, 1);
-}
-.td {
-	width: 100rpx;
-	height: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	border-right: 2rpx solid rgba(218, 217, 217, 1);
-	border-bottom: 2rpx solid rgba(218, 217, 217, 1);
-}
-
-.left {
-	box-shadow: 4px 0px 6px #e7e9eb;
-}
-
-.right {
-	width: calc(100% - 102rpx);
-	padding-right: 102rpx;
-	box-sizing: border-box;
-}
-
-.card {
-	position: fixed;
-	right: 0;
-	background-color: white;
-	box-shadow: 4px 0px 12px #e7e9eb;
-	border-radius: 8rpx;
-}
@@ -578,7 +578,7 @@
 							      </view>
 							    </view>
 							    <view class="xc_comment-font pj_word_size ellipsis-2">
-							     {{item.content?item.content:''}}
+							     {{item.content?item.content:'此用户没有填写评价。'}}
 							    </view>
 							    <view class="xc_comment-val">
 							      <view class="xc_comment-time">{{item.add_time}}</view>
@@ -795,7 +795,7 @@
             </view>
             <view class="xc-pirces">
             <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" >
-              {{item.content?item.content:''}}
+              {{item.content?item.content:'此用户没有填写评价。'}}
             </view> 
             </view>
             <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view>
@@ -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= {