Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey

components/foot-tabs/foot-tab-one.vue

@@ -1,4 +1,5 @@
 <template>
+    <view class="">
         <view class="foot-box"
         	:style="{
         		background: isGradualChange ? `linear-gradient( to ${direction}, ${colorOne} 0%, ${colorTwo} 20%, ${colorThree} 80%, ${colorFour} 100%)` : `url(${backgroundImage}) ${backgroundColor} `,
@@ -11,6 +12,8 @@
         	</view>
         	<!-- 后台动态改变的icon图 end -->
         </view>
+    </view>
+
 </template>
 <script>
 	// 引入qrcode.js （必须导出qrcode.js ）

pages/appreciationServe/appreciationServe.vue

@@ -106,15 +106,15 @@
             return {
                 data: {
                     type_id: 1,
-                    title: "",
-                    brand: "",
-                    model: "",
-                    width: "",
-                    height: "",
-                    contact_name: "",
-                    contact_phone: "",
+                    title: "广场大屏显示器",
+                    brand: "苹果",
+                    model: "IP445152",
+                    width: 100,
+                    height: 100,
+                    contact_name: "张某",
+                    contact_phone: "17552525252",
                     appointment_time: '',
-                    addres: "",
+                    addres: "上海市闵行区莘浜路421号",
                     pictures: "",
                 },
                 imgsrcArr: [],
@@ -226,7 +226,10 @@
                     this.$toolAll.tools.showToast("请选择现场图片");
                     return
                 }
-                this.data.appointment_time = new Date(this.data.appointment_time).getTime()
+                console.log(this.data.appointment_time)
+                this.data.appointment_time = new Date(this.data.appointment_time).getTime()/1000
+                this.data.width=this.data.width-0
+                this.data.height= this.data.height-0
                 this.$requst.post('/universal/api.vas/vas', this.data).then(res => {
                     if (res.code == 1) {
                         console.log(res)

pages/tabbar/pagehome/pagehome.vue

@@ -246,7 +246,7 @@
 		},
 		data() {
 			return {
-				role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
+				role: 2, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量