linweizeng vor 3 Jahren
Ursprung
Commit
471df8dbc1
50 geänderte Dateien mit 2102 neuen und 2839 gelöschten Zeilen
  1. 5 0
      App.vue
  2. 6 0
      common/css/uniCss.css
  3. 7 0
      common/router/modules/routes.js
  4. 3 0
      common/service/http.js
  5. 8 16
      common/util/work.js
  6. 3 3
      components/my-componets/my-page.vue
  7. 1 1
      main.js
  8. 15 10
      pages.json
  9. 9 6
      pages/basics/background.vue
  10. 1 1
      pages/common/exit.vue
  11. 38 25
      pages/common/helloWorld.vue
  12. 6 7
      pages/common/success.vue
  13. 1 1
      pages/communication/communication.vue
  14. 28 11
      pages/component/bar.vue
  15. 28 13
      pages/component/card.vue
  16. 30 13
      pages/component/chat.vue
  17. 30 17
      pages/component/form.vue
  18. 66 28
      pages/component/list.vue
  19. 19 12
      pages/component/modal.vue
  20. 12 5
      pages/component/nav.vue
  21. 17 10
      pages/component/steps.vue
  22. 14 9
      pages/component/swiper.vue
  23. 15 6
      pages/component/timeline.vue
  24. 1 1
      pages/fileView/reportList.vue
  25. 1 1
      pages/hold/hold.vue
  26. 2 2
      pages/home/home.vue
  27. 1 1
      pages/jiance/chaxun.vue
  28. 594 995
      pages/jiance/editOrder - 副本.vue
  29. 1 1
      pages/jiance/editOrder.vue
  30. 1 1
      pages/jiance/jindu.vue
  31. 1 1
      pages/jiance/list.vue
  32. 143 67
      pages/jiance/list/specimen.vue
  33. 12 12
      pages/jiance/manyi.vue
  34. 0 1093
      pages/jiance/order - 备份.vue
  35. 257 120
      pages/jiance/order.vue
  36. 20 1
      pages/jiance/order/meth.js
  37. 8 8
      pages/jiance/order/test.json
  38. 229 29
      pages/jiance/tousu.vue
  39. 116 0
      pages/jiance/tousu/tousuList.vue
  40. 1 1
      pages/jiance/weituo.vue
  41. 14 8
      pages/login/login.vue
  42. BIN
      pages/login/luohuLogo.png
  43. 1 1
      pages/specimen/specimen.vue
  44. 2 2
      pages/tag/sampleTag.vue
  45. 85 80
      pages/user/editpassword.vue
  46. 15 5
      pages/user/people.vue
  47. 153 137
      pages/user/userdetail.vue
  48. 82 78
      pages/user/useredit.vue
  49. BIN
      static/add.png
  50. BIN
      static/luohuLogo.png

+ 5 - 0
App.vue

@@ -174,6 +174,11 @@
 	@import "plugin/colorui/animation.css";
 	@import "common/css/uniCss.css";
 
+	.bg-luohu {
+		background: linear-gradient(to top, #3396d1, #7dbfdf);
+		color: #FFFFFF;
+	}
+
 	.nav-list {
 		display: flex;
 		flex-wrap: wrap;

+ 6 - 0
common/css/uniCss.css

@@ -33,3 +33,9 @@
 	justify-content: center;
 	align-items: center;
 }
+
+.flex-start-center {
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}

+ 7 - 0
common/router/modules/routes.js

@@ -216,6 +216,13 @@ const routes = [{
 		meta: {
 			title: '沟通',
 		},
+	},
+	{
+		path: "/pages/jiance/tousu/tousuList",
+		name: 'tousuList',
+		meta: {
+			title: '投诉列表',
+		},
 	}
 ]
 export default routes

+ 3 - 0
common/service/http.js

@@ -1,5 +1,8 @@
 let apiHosp = 'http://120.78.154.31/'
 
+// let apiHosp = 'http://172.16.40.184/'
+// let apiHosp = 'http://172.16.40.182/'
+
 export default {
 	apiHosp
 }

+ 8 - 16
common/util/work.js

@@ -11,15 +11,13 @@ export const us = {
 			description: "记录每天的工作经验和心得",
 			useCount: 1000,
 			page: 'order'
-		}
-		/* ,{
-		      title:"历史委托单",
-		      icon:icon_prefix+"zhoubao.png",
-		      description:"总结每周的工作情况和下周计划",
-		      useCount:10000,
-			  page:'list'
-		    } */
-		, {
+		}, {
+			title: "委托暂存",
+			icon: icon_prefix + "wendang.png",
+			description: "委托暂存",
+			useCount: 10000,
+			page: 'hold'
+		}, {
 			title: "委托查询",
 			icon: icon_prefix + "kaoqin.png",
 			description: "工作考勤",
@@ -31,12 +29,6 @@ export const us = {
 			description: "建立和查看个人工作安排",
 			useCount: 10000,
 			page: 'list'
-		}, {
-			title: "委托暂存",
-			icon: icon_prefix + "wendang.png",
-			description: "委托暂存",
-			useCount: 10000,
-			page: 'hold'
 		}
 		/**
 	{
@@ -172,7 +164,7 @@ export const sh = {
 			icon: icon_prefix + "renwu.png",
 			description: "任务中心",
 			useCount: 10000,
-			page: 'tousu'
+			page: 'tousuList'
 		}, {
 			title: "沟通",
 			icon: icon_prefix + "wendang.png",

+ 3 - 3
components/my-componets/my-page.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<scroll-view :scroll-y="modalName==null" class="page" :class="modalName!=null?'show':''">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+			<cu-custom bgColor="bg-luohu" :isBack="true">
 				<block slot="backText">{{back}}</block>
 				<block slot="content">{{title}}</block>
 			</cu-custom>
@@ -22,7 +22,7 @@
 				type: String,
 				default: '返回'
 			},
-			modalName:  {
+			modalName: {
 				type: String,
 				default: null
 			},
@@ -35,7 +35,7 @@
 		},
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {}

+ 1 - 1
main.js

@@ -1,4 +1,4 @@
-import '@/common/pc.js'
+// import '@/common/pc.js'
 import Vue from 'vue'
 import App from './App'
 import store from './store'

+ 15 - 10
pages.json

@@ -240,17 +240,22 @@
 				"enablePullDownRefresh": true
 			}
 
+		}, {
+			"path": "pages/communication/communication",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/jiance/tousu/tousuList",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
+			}
+
 		}
-	    ,{
-            "path" : "pages/communication/communication",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"mp-alipay": {
 			/* 支付宝小程序特有相关 */

+ 9 - 6
pages/basics/background.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-blue" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">背景</block>
 		</cu-custom>
@@ -78,7 +78,8 @@
 				<text class="cuIcon-title text-blue"></text>图片背景
 			</view>
 		</view>
-		<view class="bg-img bg-mask flex align-center" style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg');height: 414upx;">
+		<view class="bg-img bg-mask flex align-center"
+			style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg');height: 414upx;">
 			<view class="padding-xl text-white">
 				<view class="padding-xs text-xxl text-bold">
 					钢铁之翼
@@ -88,7 +89,7 @@
 				</view>
 			</view>
 		</view>
-<!-- 		<view class="cu-bar bg-white margin-top">
+		<!-- 		<view class="cu-bar bg-white margin-top">
 			<view class="action">
 				<text class="cuIcon-title text-blue"></text>视频背景
 			</view>
@@ -105,19 +106,21 @@
 				</cover-view>
 			</cover-view>
 		</view> -->
-		
+
 		<view class="cu-bar bg-white margin-top">
 			<view class="action">
 				<text class="cuIcon-title text-blue"></text>透明背景(文字层)
 			</view>
 		</view>
 		<view class="grid col-2">
-			<view class="bg-img padding-bottom-xl" style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big10007.jpg');height: 207upx;">
+			<view class="bg-img padding-bottom-xl"
+				style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big10007.jpg');height: 207upx;">
 				<view class="bg-shadeTop padding padding-bottom-xl">
 					上面开始
 				</view>
 			</view>
-			<view class="bg-img padding-top-xl flex align-end" style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg');height: 207upx;">
+			<view class="bg-img padding-top-xl flex align-end"
+				style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg');height: 207upx;">
 				<view class="bg-shadeBottom padding padding-top-xl flex-sub">
 					下面开始
 				</view>

+ 1 - 1
pages/common/exit.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<scroll-view :scroll-y="modalName==null" class="page" :class="modalName!=null?'show':''">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="false">
+			<cu-custom bgColor="bg-luohu" :isBack="false">
 				<!-- <block slot="backText">返回</block> -->
 				<block slot="content">退出页</block>
 			</cu-custom>

+ 38 - 25
pages/common/helloWorld.vue

@@ -1,60 +1,73 @@
 <template>
 	<view>
 		<scroll-view :scroll-y="modalName==null" class="page" :class="modalName!=null?'show':''">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+			<cu-custom bgColor="bg-luohu" :isBack="true">
 				<block slot="content">helloWorld</block>
 			</cu-custom>
-			
+
 			<view class="padding flex flex-direction">
-				<app-select label=" 类    型:" v-model="type" placeholder="请选择类型" :dict="plan_type" space ></app-select>
+				<app-select label=" 类    型:" v-model="type" placeholder="请选择类型" :dict="plan_type" space></app-select>
 			</view>
-			
+
 			<view class="padding flex flex-direction">
-			  <my-date label="开始时间:" v-model="beginTime" placeholder="请选择开始时间" required fields="minute"></my-date>
+				<my-date label="开始时间:" v-model="beginTime" placeholder="请选择开始时间" required fields="minute"></my-date>
 			</view>
-			
-			
+
+
 			<view class="padding flex flex-direction">
-			  <uni-calendar :showMonth="true" :selected="selected" />
+				<uni-calendar :showMonth="true" :selected="selected" />
 			</view>
-			
-			
+
+
 			<view class="padding flex flex-direction">
-			  <my-image-upload />
+				<my-image-upload />
 			</view>
-			
+
 		</scroll-view>
 	</view>
 
 </template>
 
 <script>
-	const plan_type = [{text:'日常记录',value:'1'},{text:'本周工作',value:'2'},{text:'下周计划',value:'3'}];
+	const plan_type = [{
+		text: '日常记录',
+		value: '1'
+	}, {
+		text: '本周工作',
+		value: '2'
+	}, {
+		text: '下周计划',
+		value: '3'
+	}];
 	import appSelect from '@/components/my-componets/appSelect.vue'
 	import myImageUpload from '@/components/my-componets/my-image-upload.vue'
 	import myDate from '@/components/my-componets/my-date.vue'
-	
-	
+
+
 	export default {
-		components:{
-		    appSelect,myImageUpload,myDate
-		 },
+		components: {
+			appSelect,
+			myImageUpload,
+			myDate
+		},
 		data() {
 			return {
 				modalName: null,
-				item:{msg:'退出成功'},
+				item: {
+					msg: '退出成功'
+				},
 				plan_type,
-				type:"1",
-				selected:[],
-				beginTime:''
+				type: "1",
+				selected: [],
+				beginTime: ''
 			}
 		},
-		onLoad: function (option) {			
-			console.log("this.$Route.query",this.$Route.query);
+		onLoad: function(option) {
+			console.log("this.$Route.query", this.$Route.query);
 			console.log(this.$store)
 		},
 		methods: {
-			
+
 		}
 	}
 </script>

+ 6 - 7
pages/common/success.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<scroll-view :scroll-y="modalName==null" class="page" :class="modalName!=null?'show':''">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+			<cu-custom bgColor="bg-luohu" :isBack="true">
 				<block slot="backText">返回</block>
 				<block slot="content">结果</block>
 			</cu-custom>
@@ -23,21 +23,20 @@
 </template>
 
 <script>
-	
 	export default {
 		data() {
 			return {
 				modalName: null,
-				item:{},
+				item: {},
 			}
 		},
-		onLoad: function (option) {
-		    this.item = JSON.parse(decodeURIComponent(option.item));
+		onLoad: function(option) {
+			this.item = JSON.parse(decodeURIComponent(option.item));
 		},
 		methods: {
-			goback(){
+			goback() {
 				uni.navigateTo({
-					url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			}
 		}

+ 1 - 1
pages/communication/communication.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">检测报告</block>
 		</cu-custom>

+ 28 - 11
pages/component/bar.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block><block slot="content">操作条</block></cu-custom>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">操作条</block>
+		</cu-custom>
 		<view class="cu-bar bg-white margin-top">
 			<view class="action">
 				<text class="cuIcon-title text-green"></text>
@@ -303,7 +306,9 @@
 				</view>
 			</view>
 			<view class="cu-bar bg-black search">
-				<view class="cu-avatar round" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg);"></view>
+				<view class="cu-avatar round"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg);">
+				</view>
 				<view class="content">
 					ColorUI
 				</view>
@@ -324,17 +329,21 @@
 			<view class="cu-bar search bg-white">
 				<view class="search-form round">
 					<text class="cuIcon-search"></text>
-					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="搜索图片、文章、视频" confirm-type="search"></input>
+					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text"
+						placeholder="搜索图片、文章、视频" confirm-type="search"></input>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-green shadow-blur round">搜索</button>
 				</view>
 			</view>
 			<view class="cu-bar search bg-white">
-				<view class="cu-avatar round" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big11010.jpg"></view>
+				<view class="cu-avatar round"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big11010.jpg">
+				</view>
 				<view class="search-form round">
 					<text class="cuIcon-search"></text>
-					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="搜索图片、文章、视频" confirm-type="search"></input>
+					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text"
+						placeholder="搜索图片、文章、视频" confirm-type="search"></input>
 				</view>
 				<view class="action">
 					<text>广州</text>
@@ -342,10 +351,13 @@
 				</view>
 			</view>
 			<view class="cu-bar bg-red search">
-				<view class="cu-avatar round" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big114004.jpg);"></view>
+				<view class="cu-avatar round"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big114004.jpg);">
+				</view>
 				<view class="search-form radius">
 					<text class="cuIcon-search"></text>
-					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="搜索图片、文章、视频" confirm-type="search"></input>
+					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text"
+						placeholder="搜索图片、文章、视频" confirm-type="search"></input>
 				</view>
 				<view class="action">
 					<text>广州</text>
@@ -355,7 +367,8 @@
 			<view class="cu-bar bg-cyan search">
 				<view class="search-form radius">
 					<text class="cuIcon-search"></text>
-					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="搜索图片、文章、视频" confirm-type="search"></input>
+					<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text"
+						placeholder="搜索图片、文章、视频" confirm-type="search"></input>
 				</view>
 				<view class="action">
 					<text class="cuIcon-close"></text>
@@ -397,7 +410,8 @@
 				<view class="action">
 					<text class="cuIcon-sound text-grey"></text>
 				</view>
-				<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" class="solid-bottom" :focus="false" maxlength="300" cursor-spacing="10"></input>
+				<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" class="solid-bottom"
+					:focus="false" maxlength="300" cursor-spacing="10"></input>
 				<view class="action">
 					<text class="cuIcon-emojifill text-grey"></text>
 				</view>
@@ -405,11 +419,14 @@
 			</view>
 
 			<view class="cu-bar input">
-				<view class="cu-avatar round" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg);"></view>
+				<view class="cu-avatar round"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg);">
+				</view>
 				<view class="action">
 					<text class="cuIcon-roundaddfill text-grey"></text>
 				</view>
-				<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" class="solid-bottom" maxlength="300" cursor-spacing="10"></input>
+				<input @focus="InputFocus" @blur="InputBlur" :adjust-position="false" class="solid-bottom"
+					maxlength="300" cursor-spacing="10"></input>
 				<view class="action">
 					<text class="cuIcon-emojifill text-grey"></text>
 				</view>

+ 28 - 13
pages/component/card.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block><block slot="content">卡片</block></cu-custom>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">卡片</block>
+		</cu-custom>
 		<view class="cu-bar bg-white solid-bottom">
 			<view class="action">
 				<text class="cuIcon-titles text-orange"></text> 案例类卡片
@@ -12,14 +15,17 @@
 		<view class="cu-card case" :class="isCard?'no-card':''">
 			<view class="cu-item shadow">
 				<view class="image">
-					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg"
-					 mode="widthFix"></image>
+					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg" mode="widthFix">
+					</image>
 					<view class="cu-tag bg-blue">史诗</view>
-					<view class="cu-bar bg-shadeBottom"> <text class="text-cut">我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。</text></view>
+					<view class="cu-bar bg-shadeBottom"> <text
+							class="text-cut">我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。</text></view>
 				</view>
 				<view class="cu-list menu-avatar">
 					<view class="cu-item">
-						<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);"></view>
+						<view class="cu-avatar round lg"
+							style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);">
+						</view>
 						<view class="content flex-sub">
 							<view class="text-grey">正义天使 凯尔</view>
 							<view class="text-gray text-sm flex justify-between">
@@ -47,7 +53,9 @@
 			<view class="cu-item shadow">
 				<view class="cu-list menu-avatar">
 					<view class="cu-item">
-						<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);"></view>
+						<view class="cu-avatar round lg"
+							style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);">
+						</view>
 						<view class="content flex-sub">
 							<view>凯尔</view>
 							<view class="text-gray text-sm flex justify-between">
@@ -60,8 +68,9 @@
 					折磨生出苦难,苦难又会加剧折磨,凡间这无穷的循环,将有我来终结!
 				</view>
 				<view class="grid flex-sub padding-lr" :class="isCard?'col-3 grid-square':'col-1'">
-					<view class="bg-img" :class="isCard?'':'only-img'" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);"
-					 v-for="(item,index) in isCard?9:1" :key="index">
+					<view class="bg-img" :class="isCard?'':'only-img'"
+						style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);"
+						v-for="(item,index) in isCard?9:1" :key="index">
 					</view>
 				</view>
 				<view class="text-gray text-sm text-right padding">
@@ -72,7 +81,9 @@
 
 				<view class="cu-list menu-avatar comment solids-top">
 					<view class="cu-item">
-						<view class="cu-avatar round" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);"></view>
+						<view class="cu-avatar round"
+							style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);">
+						</view>
 						<view class="content">
 							<view class="text-grey">莫甘娜</view>
 							<view class="text-gray text-content text-df">
@@ -95,7 +106,9 @@
 					</view>
 
 					<view class="cu-item">
-						<view class="cu-avatar round" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);"></view>
+						<view class="cu-avatar round"
+							style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);">
+						</view>
 						<view class="content">
 							<view class="text-grey">凯尔</view>
 							<view class="text-gray text-content text-df">
@@ -130,10 +143,12 @@
 		</view>
 		<view class="cu-card article" :class="isCard?'no-card':''">
 			<view class="cu-item shadow">
-				<view class="title"><view class="text-cut">无意者 烈火焚身;以正义的烈火拔出黑暗。我有自己的正义,见证至高的烈火吧。</view></view>
+				<view class="title">
+					<view class="text-cut">无意者 烈火焚身;以正义的烈火拔出黑暗。我有自己的正义,见证至高的烈火吧。</view>
+				</view>
 				<view class="content">
-					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg"
-					 mode="aspectFill"></image>
+					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg" mode="aspectFill">
+					</image>
 					<view class="desc">
 						<view class="text-content"> 折磨生出苦难,苦难又会加剧折磨,凡间这无穷的循环,将有我来终结!真正的恩典因不完整而美丽,因情感而真诚,因脆弱而自由!</view>
 						<view>

+ 30 - 13
pages/component/chat.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block><block slot="content">聊天</block></cu-custom>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">聊天</block>
+		</cu-custom>
 		<view class="cu-chat">
 			<view class="cu-item self">
 				<view class="main">
@@ -8,12 +11,16 @@
 						<text>喵喵喵!喵喵喵!喵喵喵!喵喵!喵喵!!喵!喵喵喵!</text>
 					</view>
 				</view>
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);"></view>
+				<view class="cu-avatar radius"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);">
+				</view>
 				<view class="date">2018年3月23日 13:23</view>
 			</view>
 			<view class="cu-info round">对方撤回一条消息!</view>
 			<view class="cu-item">
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big143004.jpg);"></view>
+				<view class="cu-avatar radius"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big143004.jpg);">
+				</view>
 				<view class="main">
 					<view class="content shadow">
 						<text>喵喵喵!喵喵喵!</text>
@@ -30,9 +37,12 @@
 			</view>
 			<view class="cu-item self">
 				<view class="main">
-					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg" class="radius" mode="widthFix"></image>
+					<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg" class="radius"
+						mode="widthFix"></image>
+				</view>
+				<view class="cu-avatar radius"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);">
 				</view>
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);"></view>
 				<view class="date"> 13:23</view>
 			</view>
 			<view class="cu-item self">
@@ -44,7 +54,9 @@
 						<text class="cuIcon-sound text-xxl padding-right-xl"> </text>
 					</view>
 				</view>
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);"></view>
+				<view class="cu-avatar radius"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);">
+				</view>
 				<view class="date">13:23</view>
 			</view>
 			<view class="cu-item self">
@@ -56,17 +68,22 @@
 						喵星球,喵喵市
 					</view>
 				</view>
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);"></view>
+				<view class="cu-avatar radius"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big107000.jpg);">
+				</view>
 				<view class="date">13:23</view>
 			</view>
 			<view class="cu-item">
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big143004.jpg);"></view>
+				<view class="cu-avatar radius"
+					style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big143004.jpg);">
+				</view>
 				<view class="main">
 					<view class="content shadow">
 						@#$^&**
 					</view>
 					<view class="action text-grey">
-						<text class="cuIcon-warnfill text-red text-xxl"></text> <text class="text-sm margin-left-sm">翻译错误</text>
+						<text class="cuIcon-warnfill text-red text-xxl"></text> <text
+							class="text-sm margin-left-sm">翻译错误</text>
 					</view>
 				</view>
 				<view class="date">13:23</view>
@@ -78,7 +95,7 @@
 				<text class="cuIcon-sound text-grey"></text>
 			</view>
 			<input class="solid-bottom" :adjust-position="false" :focus="false" maxlength="300" cursor-spacing="10"
-			 @focus="InputFocus" @blur="InputBlur"></input>
+				@focus="InputFocus" @blur="InputBlur"></input>
 			<view class="action">
 				<text class="cuIcon-emojifill text-grey"></text>
 			</view>
@@ -107,7 +124,7 @@
 </script>
 
 <style>
-page{
-  padding-bottom: 100upx;
-}
+	page {
+		padding-bottom: 100upx;
+	}
 </style>

+ 30 - 17
pages/component/form.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">表单</block>
 		</cu-custom>
@@ -50,7 +50,8 @@
 			<!-- #ifndef MP-ALIPAY -->
 			<view class="cu-form-group">
 				<view class="title">多列选择</view>
-				<picker mode="multiSelector" @change="MultiChange" @columnchange="MultiColumnChange" :value="multiIndex" :range="multiArray">
+				<picker mode="multiSelector" @change="MultiChange" @columnchange="MultiColumnChange" :value="multiIndex"
+					:range="multiArray">
 					<view class="picker">
 						{{multiArray[0][multiIndex[0]]}},{{multiArray[1][multiIndex[1]]}},{{multiArray[2][multiIndex[2]]}}
 					</view>
@@ -90,21 +91,25 @@
 			<view class="cu-form-group">
 				<view class="title">定义颜色</view>
 				<!-- #ifdef MP-ALIPAY -->
-				<switch class='red' @change="SwitchB" :class="switchB?'checked':''" :checked="switchB?true:false" color="#e54d42"></switch>
+				<switch class='red' @change="SwitchB" :class="switchB?'checked':''" :checked="switchB?true:false"
+					color="#e54d42"></switch>
 				<!-- #endif -->
 
 				<!-- #ifndef MP-ALIPAY -->
-				<switch class='red' @change="SwitchB" :class="switchB?'checked':''" :checked="switchB?true:false"></switch>
+				<switch class='red' @change="SwitchB" :class="switchB?'checked':''" :checked="switchB?true:false">
+				</switch>
 				<!-- #endif -->
 			</view>
 			<view class="cu-form-group">
 				<view class="title">定义图标</view>
-				<switch class='switch-sex' @change="SwitchC" :class="switchC?'checked':''" :checked="switchC?true:false"></switch>
+				<switch class='switch-sex' @change="SwitchC" :class="switchC?'checked':''"
+					:checked="switchC?true:false"></switch>
 			</view>
 			<!-- #ifndef MP-ALIPAY -->
 			<view class="cu-form-group">
 				<view class="title">方形开关</view>
-				<switch class='orange radius' @change="SwitchD" :class="switchD?'checked':''" :checked="switchD?true:false"></switch>
+				<switch class='orange radius' @change="SwitchD" :class="switchD?'checked':''"
+					:checked="switchD?true:false"></switch>
 			</view>
 			<!-- #endif -->
 			<radio-group class="block" @change="RadioChange">
@@ -115,13 +120,16 @@
 				<!-- #ifndef MP-ALIPAY -->
 				<view class="cu-form-group">
 					<view class="title">定义样式</view>
-					<radio class='radio' :class="radio=='B'?'checked':''" :checked="radio=='B'?true:false" value="B"></radio>
+					<radio class='radio' :class="radio=='B'?'checked':''" :checked="radio=='B'?true:false" value="B">
+					</radio>
 				</view>
 				<view class="cu-form-group">
 					<view class="title">定义颜色</view>
 					<view>
-						<radio class='blue radio' :class="radio=='C'?'checked':''" :checked="radio=='C'?true:false" value="C"></radio>
-						<radio class='red margin-left-sm' :class="radio=='D'?'checked':''" :checked="radio=='D'?true:false" value="D"></radio>
+						<radio class='blue radio' :class="radio=='C'?'checked':''" :checked="radio=='C'?true:false"
+							value="C"></radio>
+						<radio class='red margin-left-sm' :class="radio=='D'?'checked':''"
+							:checked="radio=='D'?true:false" value="D"></radio>
 					</view>
 				</view>
 				<!-- #endif -->
@@ -129,17 +137,19 @@
 			<checkbox-group class="block" @change="CheckboxChange">
 				<view class="cu-form-group margin-top">
 					<view class="title">复选选操作(checkbox)</view>
-					<checkbox :class="checkbox[0].checked?'checked':''" :checked="checkbox[0].checked?true:false" value="A"></checkbox>
+					<checkbox :class="checkbox[0].checked?'checked':''" :checked="checkbox[0].checked?true:false"
+						value="A"></checkbox>
 				</view>
 				<!-- #ifndef MP-ALIPAY -->
 				<view class="cu-form-group">
 					<view class="title">定义形状</view>
-					<checkbox class='round' :class="checkbox[1].checked?'checked':''" :checked="checkbox[1].checked?true:false" value="B"></checkbox>
+					<checkbox class='round' :class="checkbox[1].checked?'checked':''"
+						:checked="checkbox[1].checked?true:false" value="B"></checkbox>
 				</view>
 				<view class="cu-form-group">
 					<view class="title">定义颜色</view>
-					<checkbox class='round blue' :class="checkbox[2].checked?'checked':''" :checked="checkbox[2].checked?true:false"
-					 value="C"></checkbox>
+					<checkbox class='round blue' :class="checkbox[2].checked?'checked':''"
+						:checked="checkbox[2].checked?true:false" value="C"></checkbox>
 				</view>
 				<!-- #endif -->
 			</checkbox-group>
@@ -153,8 +163,9 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
-					 <image :src="imgList[index]" mode="aspectFill"></image>
+					<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
+						:data-url="imgList[index]">
+						<image :src="imgList[index]" mode="aspectFill"></image>
 						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
 							<text class='cuIcon-close'></text>
 						</view>
@@ -170,11 +181,13 @@
 			</view>
 			<!-- !!!!! placeholder 在ios表现有偏移 建议使用 第一种样式 -->
 			<view class="cu-form-group margin-top">
-				<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaAInput" placeholder="多行文本输入框"></textarea>
+				<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaAInput"
+					placeholder="多行文本输入框"></textarea>
 			</view>
 			<view class="cu-form-group align-start">
 				<view class="title">文本框</view>
-				<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaBInput" placeholder="多行文本输入框"></textarea>
+				<textarea maxlength="-1" :disabled="modalName!=null" @input="textareaBInput"
+					placeholder="多行文本输入框"></textarea>
 			</view>
 		</form>
 	</view>

+ 66 - 28
pages/component/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<scroll-view :scroll-y="modalName==null" class="page" :class="modalName!=null?'show':''">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+			<cu-custom bgColor="bg-luohu" :isBack="true">
 				<block slot="backText">返回</block>
 				<block slot="content">列表</block>
 			</cu-custom>
@@ -20,7 +20,8 @@
 							<view class="cu-item" v-for="(item,index) in 3" :key="index">
 								<label class="flex justify-between align-center flex-sub">
 									<view class="flex-sub">{{index +3}} 列</view>
-									<radio class="round" :value="(index + 3) + ''" :class="gridCol==index+3?'checked':''" :checked="gridCol==index+3"></radio>
+									<radio class="round" :value="(index + 3) + ''"
+										:class="gridCol==index+3?'checked':''" :checked="gridCol==index+3"></radio>
 								</label>
 							</view>
 						</view>
@@ -31,7 +32,8 @@
 								<text class="text-grey">边框</text>
 							</view>
 							<view class="action">
-								<switch @change="Gridswitch" :class="gridBorder?'checked':''" :checked="gridBorder?true:false"></switch>
+								<switch @change="Gridswitch" :class="gridBorder?'checked':''"
+									:checked="gridBorder?true:false"></switch>
 							</view>
 						</view>
 					</view>
@@ -65,7 +67,8 @@
 								<text class="text-grey">短边框</text>
 							</view>
 							<view class="action">
-								<switch @change="MenuBorder" :class="menuBorder?'checked':''" :checked="menuBorder?true:false"></switch>
+								<switch @change="MenuBorder" :class="menuBorder?'checked':''"
+									:checked="menuBorder?true:false"></switch>
 							</view>
 						</view>
 						<view class="cu-item">
@@ -73,7 +76,8 @@
 								<text class="text-grey">箭头</text>
 							</view>
 							<view class="action">
-								<switch @change="MenuArrow" :class="menuArrow?'checked':''" :checked="menuArrow?true:false"></switch>
+								<switch @change="MenuArrow" :class="menuArrow?'checked':''"
+									:checked="menuArrow?true:false"></switch>
 							</view>
 						</view>
 						<view class="cu-item">
@@ -81,7 +85,8 @@
 								<text class="text-grey">卡片</text>
 							</view>
 							<view class="action">
-								<switch @change="MenuCard" :class="menuCard?'checked':''" :checked="menuCard?true:false"></switch>
+								<switch @change="MenuCard" :class="menuCard?'checked':''"
+									:checked="menuCard?true:false"></switch>
 							</view>
 						</view>
 					</view>
@@ -119,10 +124,18 @@
 					</view>
 					<view class="action">
 						<view class="cu-avatar-group">
-							<view class="cu-avatar round sm" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);"></view>
-							<view class="cu-avatar round sm" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81005.jpg);"></view>
-							<view class="cu-avatar round sm" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big25002.jpg);"></view>
-							<view class="cu-avatar round sm" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg);"></view>
+							<view class="cu-avatar round sm"
+								style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);">
+							</view>
+							<view class="cu-avatar round sm"
+								style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81005.jpg);">
+							</view>
+							<view class="cu-avatar round sm"
+								style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big25002.jpg);">
+							</view>
+							<view class="cu-avatar round sm"
+								style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg);">
+							</view>
 						</view>
 						<text class="text-grey text-sm">4 人</text>
 					</view>
@@ -160,12 +173,15 @@
 				<view class="cu-item">
 					<view class="content padding-tb-sm">
 						<view>
-							<text class="cuIcon-clothesfill text-blue margin-right-xs"></text> 多行Item</view>
+							<text class="cuIcon-clothesfill text-blue margin-right-xs"></text> 多行Item
+						</view>
 						<view class="text-gray text-sm">
-							<text class="cuIcon-infofill margin-right-xs"></text> 小目标还没有实现!</view>
+							<text class="cuIcon-infofill margin-right-xs"></text> 小目标还没有实现!
+						</view>
 					</view>
 					<view class="action">
-						<switch class="switch-sex" @change="SwitchSex" :class="skin?'checked':''" :checked="skin?true:false"></switch>
+						<switch class="switch-sex" @change="SwitchSex" :class="skin?'checked':''"
+							:checked="skin?true:false"></switch>
 					</view>
 				</view>
 			</view>
@@ -177,14 +193,17 @@
 			</view>
 			<view class="cu-list menu-avatar">
 				<view class="cu-item">
-					<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);"></view>
+					<view class="cu-avatar round lg"
+						style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);">
+					</view>
 					<view class="content">
 						<view class="text-grey">凯尔</view>
 						<view class="text-gray text-sm flex">
 							<view class="text-cut">
 								<text class="cuIcon-infofill text-red  margin-right-xs"></text>
 								我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。我已天理为凭,踏入这片荒芜,不再受凡人的枷锁遏制。
-							</view> </view>
+							</view>
+						</view>
 					</view>
 					<view class="action">
 						<view class="text-grey text-xs">22:20</view>
@@ -192,7 +211,8 @@
 					</view>
 				</view>
 				<view class="cu-item">
-					<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Taric.png);">
+					<view class="cu-avatar round lg"
+						style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Taric.png);">
 						<view class="cu-tag badge">99+</view>
 					</view>
 					<view class="content">
@@ -212,10 +232,16 @@
 					</view>
 				</view>
 				<view class="cu-item ">
-					<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);"></view>
+					<view class="cu-avatar radius lg"
+						style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);">
+					</view>
 					<view class="content">
-						<view class="text-pink"><view class="text-cut">莫甘娜</view></view>
-						<view class="text-gray text-sm flex"> <view class="text-cut">凯尔,你被自己的光芒变的盲目!</view></view>
+						<view class="text-pink">
+							<view class="text-cut">莫甘娜</view>
+						</view>
+						<view class="text-gray text-sm flex">
+							<view class="text-cut">凯尔,你被自己的光芒变的盲目!</view>
+						</view>
 					</view>
 					<view class="action">
 						<view class="text-grey text-xs">22:20</view>
@@ -223,12 +249,17 @@
 					</view>
 				</view>
 				<view class="cu-item grayscale">
-					<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81007.jpg);"></view>
+					<view class="cu-avatar radius lg"
+						style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81007.jpg);">
+					</view>
 					<view class="content">
-						<view><view class="text-cut">伊泽瑞尔</view>
+						<view>
+							<view class="text-cut">伊泽瑞尔</view>
 							<view class="cu-tag round bg-orange sm">断开连接...</view>
 						</view>
-						<view class="text-gray text-sm flex"> <view class="text-cut"> 等我回来一个打十个</view></view>
+						<view class="text-gray text-sm flex">
+							<view class="text-cut"> 等我回来一个打十个</view>
+						</view>
 					</view>
 					<view class="action">
 						<view class="text-grey text-xs">22:20</view>
@@ -236,7 +267,8 @@
 					</view>
 				</view>
 				<view class="cu-item cur">
-					<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81020.jpg);">
+					<view class="cu-avatar radius lg"
+						style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81020.jpg);">
 						<view class="cu-tag badge"></view>
 					</view>
 					<view class="content">
@@ -245,7 +277,9 @@
 							<view class="cu-tag round bg-orange sm">6人</view>
 						</view>
 						<view class="text-gray text-sm flex">
-							<view class="text-cut"> 伊泽瑞尔:<text class="cuIcon-locationfill text-orange margin-right-xs"></text> 传送中...</view></view>
+							<view class="text-cut"> 伊泽瑞尔:<text
+									class="cuIcon-locationfill text-orange margin-right-xs"></text> 传送中...</view>
+						</view>
 					</view>
 					<view class="action">
 						<view class="text-grey text-xs">22:20</view>
@@ -259,13 +293,17 @@
 				</view>
 			</view>
 			<view class="cu-list menu-avatar">
-				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in 4" :key="index"
-				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index">
-					<view class="cu-avatar round lg" :style="[{backgroundImage:'url(https://ossweb-img.qq.com/images/lol/web201310/skin/big2100'+ (index+2) +'.jpg)'}]"></view>
+				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in 4"
+					:key="index" @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
+					:data-target="'move-box-' + index">
+					<view class="cu-avatar round lg"
+						:style="[{backgroundImage:'url(https://ossweb-img.qq.com/images/lol/web201310/skin/big2100'+ (index+2) +'.jpg)'}]">
+					</view>
 					<view class="content">
 						<view class="text-grey">文晓港</view>
 						<view class="text-gray text-sm">
-							<text class="cuIcon-infofill text-red  margin-right-xs"></text> 消息未送达</view>
+							<text class="cuIcon-infofill text-red  margin-right-xs"></text> 消息未送达
+						</view>
 					</view>
 					<view class="action">
 						<view class="text-grey text-xs">22:20</view>

+ 19 - 12
pages/component/modal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">模态窗口</block>
 		</cu-custom>
@@ -52,7 +52,8 @@
 			</view>
 			<view class="action">
 				<button class="cu-btn bg-green shadow" @tap="showModal" data-target="DialogModal1">Dialog</button>
-				<button class="cu-btn bg-blue shadow margin-left" @tap="showModal" data-target="DialogModal2">Dialog</button>
+				<button class="cu-btn bg-blue shadow margin-left" @tap="showModal"
+					data-target="DialogModal2">Dialog</button>
 			</view>
 		</view>
 		<view class="cu-modal" :class="modalName=='DialogModal1'?'show':''">
@@ -89,7 +90,8 @@
 				</view>
 				<view class="cu-bar bg-white">
 					<view class="action margin-0 flex-sub text-green " @tap="hideModal">
-						<text class="cuIcon-moneybag"></text>微信支付</view>
+						<text class="cuIcon-moneybag"></text>微信支付
+					</view>
 					<view class="action margin-0 flex-sub text-green solid-left" @tap="hideModal">取消</view>
 					<view class="action margin-0 flex-sub  solid-left" @tap="hideModal">确定</view>
 				</view>
@@ -107,7 +109,8 @@
 
 		<view class="cu-modal" :class="modalName=='Image'?'show':''">
 			<view class="cu-dialog">
-				<view class="bg-img" style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg');height:200px;">
+				<view class="bg-img"
+					style="background-image: url('https://ossweb-img.qq.com/images/lol/web201310/skin/big91012.jpg');height:200px;">
 					<view class="cu-bar justify-end text-white">
 						<view class="action" @tap="hideModal">
 							<text class="cuIcon-close "></text>
@@ -137,8 +140,8 @@
 						<view class="cu-item" v-for="(item,index) in 5" :key="index">
 							<label class="flex justify-between align-center flex-sub">
 								<view class="flex-sub">Item {{index +1}}</view>
-								<radio class="round" :class="radio=='radio' + index?'checked':''" :checked="radio=='radio' + index?true:false"
-								 :value="'radio' + index"></radio>
+								<radio class="round" :class="radio=='radio' + index?'checked':''"
+									:checked="radio=='radio' + index?true:false" :value="'radio' + index"></radio>
 							</label>
 						</view>
 					</view>
@@ -162,9 +165,10 @@
 				</view>
 				<view class="grid col-3 padding-sm">
 					<view v-for="(item,index) in checkbox" class="padding-xs" :key="index">
-						<button class="cu-btn orange lg block" :class="item.checked?'bg-orange':'line-orange'" @tap="ChooseCheckbox"
-						 :data-value="item.value"> {{item.name}}
-							<view class="cu-tag sm round" :class="item.checked?'bg-white text-orange':'bg-orange'" v-if="item.hot">HOT</view>
+						<button class="cu-btn orange lg block" :class="item.checked?'bg-orange':'line-orange'"
+							@tap="ChooseCheckbox" :data-value="item.value"> {{item.name}}
+							<view class="cu-tag sm round" :class="item.checked?'bg-white text-orange':'bg-orange'"
+								v-if="item.hot">HOT</view>
 						</button>
 					</view>
 				</view>
@@ -177,11 +181,13 @@
 			</view>
 			<view class="action">
 				<button class="cu-btn bg-green shadow" @tap="showModal" data-target="DrawerModalL">Left</button>
-				<button class="cu-btn bg-blue shadow margin-left" @tap="showModal" data-target="DrawerModalR">Right</button>
+				<button class="cu-btn bg-blue shadow margin-left" @tap="showModal"
+					data-target="DrawerModalR">Right</button>
 			</view>
 		</view>
 		<view class="cu-modal drawer-modal justify-start" :class="modalName=='DrawerModalL'?'show':''" @tap="hideModal">
-			<view class="cu-dialog basis-lg" @tap.stop="" :style="[{top:CustomBar+'px',height:'calc(100vh - ' + CustomBar + 'px)'}]">
+			<view class="cu-dialog basis-lg" @tap.stop=""
+				:style="[{top:CustomBar+'px',height:'calc(100vh - ' + CustomBar + 'px)'}]">
 				<view class="cu-list menu text-left">
 					<view class="cu-item arrow" v-for="(item,index) in 5" :key="index">
 						<view class="content">
@@ -193,7 +199,8 @@
 		</view>
 
 		<view class="cu-modal drawer-modal justify-end" :class="modalName=='DrawerModalR'?'show':''" @tap="hideModal">
-			<view class="cu-dialog basis-lg" @tap.stop="" :style="[{top:CustomBar+'px',height:'calc(100vh - ' + CustomBar + 'px)'}]">
+			<view class="cu-dialog basis-lg" @tap.stop=""
+				:style="[{top:CustomBar+'px',height:'calc(100vh - ' + CustomBar + 'px)'}]">
 				<view class="cu-list menu text-left">
 					<view class="cu-item arrow" v-for="(item,index) in 5" :key="index">
 						<view class="content">

+ 12 - 5
pages/component/nav.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block><block slot="content">导航栏</block></cu-custom>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">导航栏</block>
+		</cu-custom>
 		<view v-for="(item,index) in 10" :key="index" v-if="index==TabCur" class="bg-grey padding margin text-center">
 			Tab{{index}}
 		</view>
@@ -10,7 +13,8 @@
 			</view>
 		</view>
 		<scroll-view scroll-x class="bg-white nav" scroll-with-animation :scroll-left="scrollLeft">
-			<view class="cu-item" :class="index==TabCur?'text-green cur':''" v-for="(item,index) in 10" :key="index" @tap="tabSelect" :data-id="index">
+			<view class="cu-item" :class="index==TabCur?'text-green cur':''" v-for="(item,index) in 10" :key="index"
+				@tap="tabSelect" :data-id="index">
 				Tab{{index}}
 			</view>
 		</scroll-view>
@@ -21,7 +25,8 @@
 			</view>
 		</view>
 		<scroll-view scroll-x class="bg-white nav text-center">
-			<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in 3" :key="index" @tap="tabSelect" :data-id="index">
+			<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in 3" :key="index"
+				@tap="tabSelect" :data-id="index">
 				Tab{{index}}
 			</view>
 		</scroll-view>
@@ -33,7 +38,8 @@
 		</view>
 		<scroll-view scroll-x class="bg-white nav">
 			<view class="flex text-center">
-				<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''" v-for="(item,index) in 4" :key="index" @tap="tabSelect" :data-id="index">
+				<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''" v-for="(item,index) in 4"
+					:key="index" @tap="tabSelect" :data-id="index">
 					Tab{{index}}
 				</view>
 			</view>
@@ -44,7 +50,8 @@
 			</view>
 		</view>
 		<scroll-view scroll-x class="bg-red nav text-center">
-			<view class="cu-item" :class="index==TabCur?'text-white cur':''" v-for="(item,index) in 3" :key="index" @tap="tabSelect" :data-id="index">
+			<view class="cu-item" :class="index==TabCur?'text-white cur':''" v-for="(item,index) in 3" :key="index"
+				@tap="tabSelect" :data-id="index">
 				Tab{{index}}
 			</view>
 		</scroll-view>

+ 17 - 10
pages/component/steps.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block><block slot="content">步骤条</block></cu-custom>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">步骤条</block>
+		</cu-custom>
 		<view class="cu-bar bg-white solid-bottom">
 			<view class="action">
 				<text class="cuIcon-title text-orange"></text> 基本用法
@@ -11,7 +14,8 @@
 		</view>
 		<view class="bg-white padding">
 			<view class="cu-steps">
-				<view class="cu-item" :class="index>basics?'':'text-red'" v-for="(item,index) in basicsList" :key="index">
+				<view class="cu-item" :class="index>basics?'':'text-red'" v-for="(item,index) in basicsList"
+					:key="index">
 					<text :class="'cuIcon-' + item.cuIcon"></text> {{item.name}}
 				</view>
 			</view>
@@ -19,7 +23,8 @@
 
 		<view class="bg-white padding margin-top-xs">
 			<view class="cu-steps">
-				<view class="cu-item" :class="index>basics?'':'text-orange'" v-for="(item,index) in basicsList" :key="index">
+				<view class="cu-item" :class="index>basics?'':'text-orange'" v-for="(item,index) in basicsList"
+					:key="index">
 					<text :class="index>basics?'cuIcon-title':'cuIcon-' + item.cuIcon"></text> {{item.name}}
 				</view>
 			</view>
@@ -27,7 +32,8 @@
 
 		<view class="bg-white padding  margin-top-xs">
 			<view class="cu-steps steps-arrow">
-				<view class="cu-item" :class="index>basics?'':'text-blue'" v-for="(item,index) in basicsList" :key="index">
+				<view class="cu-item" :class="index>basics?'':'text-blue'" v-for="(item,index) in basicsList"
+					:key="index">
 					<text :class="'cuIcon-' + item.cuIcon"></text> {{item.name}}
 				</view>
 			</view>
@@ -55,9 +61,10 @@
 				<button class="cu-btn bg-green shadow" @tap="ScrollSteps">下一步</button>
 			</view>
 		</view>
-		<scroll-view scroll-x class="bg-white padding response cu-steps steps-bottom" :scroll-into-view="'scroll-' + scroll"
-		 scroll-with-animation>
-			<view class="cu-item padding-lr-xl" :class="index>scroll?'':'text-blue'" v-for="(item,index) in 10" :key="index" :id="'scroll-' + index">
+		<scroll-view scroll-x class="bg-white padding response cu-steps steps-bottom"
+			:scroll-into-view="'scroll-' + scroll" scroll-with-animation>
+			<view class="cu-item padding-lr-xl" :class="index>scroll?'':'text-blue'" v-for="(item,index) in 10"
+				:key="index" :id="'scroll-' + index">
 				Level {{index + 1}} <text class="num" :data-index="index + 1"></text>
 			</view>
 		</scroll-view>
@@ -97,13 +104,13 @@
 		},
 		methods: {
 			BasicsSteps() {
-				this.basics= this.basics == this.basicsList.length - 1 ? 0 : this.basics + 1				
+				this.basics = this.basics == this.basicsList.length - 1 ? 0 : this.basics + 1
 			},
 			NumSteps() {
-				this.num= this.num == this.numList.length - 1 ? 0 : this.num + 1				
+				this.num = this.num == this.numList.length - 1 ? 0 : this.num + 1
 			},
 			ScrollSteps() {
-				this.scroll= this.scroll == 9 ? 0 : this.scroll + 1				
+				this.scroll = this.scroll == 9 ? 0 : this.scroll + 1
 			}
 		}
 	}

+ 14 - 9
pages/component/swiper.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
 			<block slot="content">轮播图</block>
 		</cu-custom>
 		<view class="cu-bar bg-white">
@@ -12,10 +13,11 @@
 			</view>
 		</view>
 		<swiper class="screen-swiper" :class="dotStyle?'square-dot':'round-dot'" :indicator-dots="true" :circular="true"
-		 :autoplay="true" interval="5000" duration="500">
+			:autoplay="true" interval="5000" duration="500">
 			<swiper-item v-for="(item,index) in swiperList" :key="index">
 				<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
-				<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover" v-if="item.type=='video'"></video>
+				<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover"
+					v-if="item.type=='video'"></video>
 			</swiper-item>
 		</swiper>
 		<!-- #ifndef MP-ALIPAY -->
@@ -25,25 +27,28 @@
 			</view>
 		</view>
 		<swiper class="card-swiper" :class="dotStyle?'square-dot':'round-dot'" :indicator-dots="true" :circular="true"
-		 :autoplay="true" interval="5000" duration="500" @change="cardSwiper" indicator-color="#8799a3"
-		 indicator-active-color="#0081ff">
+			:autoplay="true" interval="5000" duration="500" @change="cardSwiper" indicator-color="#8799a3"
+			indicator-active-color="#0081ff">
 			<swiper-item v-for="(item,index) in swiperList" :key="index" :class="cardCur==index?'cur':''">
 				<view class="swiper-item">
 					<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
-					<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover" v-if="item.type=='video'"></video>
+					<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false"
+						objectFit="cover" v-if="item.type=='video'"></video>
 				</view>
 			</swiper-item>
 		</swiper>
 		<view class="cu-bar bg-white margin-top">
 			<view class="action">
-				<text class="cuIcon-title text-pink"></text> 堆叠式轮播 
+				<text class="cuIcon-title text-pink"></text> 堆叠式轮播
 			</view>
 		</view>
 		<view class="tower-swiper" @touchmove="TowerMove" @touchstart="TowerStart" @touchend="TowerEnd">
-			<view class="tower-item" :class="item.zIndex==1?'none':''" v-for="(item,index) in swiperList" :key="index" :style="[{'--index': item.zIndex,'--left':item.mLeft}]" :data-direction="direction">
+			<view class="tower-item" :class="item.zIndex==1?'none':''" v-for="(item,index) in swiperList" :key="index"
+				:style="[{'--index': item.zIndex,'--left':item.mLeft}]" :data-direction="direction">
 				<view class="swiper-item">
 					<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
-					<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover" v-if="item.type=='video'"></video>
+					<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false"
+						objectFit="cover" v-if="item.type=='video'"></video>
 				</view>
 			</view>
 		</view>

+ 15 - 6
pages/component/timeline.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true"><block slot="backText">返回</block><block slot="content">时间轴</block></cu-custom>
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">时间轴</block>
+		</cu-custom>
 		<view class="cu-timeline">
 			<view class="cu-time">昨天</view>
 			<view class="cu-item cur cuIcon-noticefill">
@@ -45,18 +48,22 @@
 						<view class="cu-tag bg-cyan">上午</view>
 						<view class="cu-tag line-cyan">10:00</view>
 					</view>
-					<view class="margin-top">这是第一次,我家的铲屎官走了这么久。久到足足有三天!! 在听到他的脚步声响在楼梯间的那一刻,我简直想要破门而出,对着他狠狠地吼上10分钟,然后再看心情要不要他进门。</view>
+					<view class="margin-top">这是第一次,我家的铲屎官走了这么久。久到足足有三天!!
+						在听到他的脚步声响在楼梯间的那一刻,我简直想要破门而出,对着他狠狠地吼上10分钟,然后再看心情要不要他进门。</view>
 				</view>
 			</view>
 			<view class="cu-item text-blue">
 				<view class="bg-blue shadow-blur content">
 					<view class="cu-list menu-avatar radius">
 						<view class="cu-item">
-							<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);"></view>
+							<view class="cu-avatar round lg"
+								style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);">
+							</view>
 							<view class="content">
 								<view class="text-grey">文晓港</view>
 								<view class="text-gray text-sm">
-									<text class="cuIcon-infofill text-red"></text> 消息未送达</view>
+									<text class="cuIcon-infofill text-red"></text> 消息未送达
+								</view>
 							</view>
 							<view class="action">
 								<view class="text-grey text-xs">22:20</view>
@@ -64,7 +71,8 @@
 							</view>
 						</view>
 						<view class="cu-item">
-							<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);">
+							<view class="cu-avatar round lg"
+								style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg);">
 								<view class="cu-tag badge">99+</view>
 							</view>
 							<view class="content">
@@ -72,7 +80,8 @@
 									<view class="cu-tag round orange sm">SVIP</view>
 								</view>
 								<view class="text-gray text-sm">
-									<text class="cuIcon-redpacket_fill text-red"></text> 收到红包</view>
+									<text class="cuIcon-redpacket_fill text-red"></text> 收到红包
+								</view>
 							</view>
 							<view class="action">
 								<view class="text-grey text-xs">22:20</view>

+ 1 - 1
pages/fileView/reportList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">检测报告</block>
 		</cu-custom>

+ 1 - 1
pages/hold/hold.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">委托暂存</block>
 		</cu-custom>

+ 2 - 2
pages/home/home.vue

@@ -14,7 +14,7 @@
 			<!-- 常用服务 -->
 			<view class="cu-bar bg-white solid-bottom" :style="[{animation: 'show 0.5s 1'}]">
 				<view class="action">
-					<text class='cuIcon-title text-blue'></text>个人中心(开发中)
+					<text class='cuIcon-title text-blue'></text>个人中心
 				</view>
 			</view>
 
@@ -35,7 +35,7 @@
 
 			<view class="cu-bar bg-white solid-bottom margin-top" :style="[{animation: 'show 0.6s 1'}]">
 				<view class="action">
-					<text class='cuIcon-title text-yellow'></text>售后服务(开发中)
+					<text class='cuIcon-title text-yellow'></text>售后服务
 				</view>
 			</view>
 			<view class="cu-list grid col-4 text-sm">

+ 1 - 1
pages/jiance/chaxun.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">查询委托申请单</block>
 		</cu-custom>

Datei-Diff unterdrückt, da er zu groß ist
+ 594 - 995
pages/jiance/editOrder - 副本.vue


+ 1 - 1
pages/jiance/editOrder.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">委托申请</block>
 		</cu-custom>

+ 1 - 1
pages/jiance/jindu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">委托单列表</block>
 		</cu-custom>

+ 1 - 1
pages/jiance/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">我的样品</block>
 		</cu-custom>

+ 143 - 67
pages/jiance/list/specimen.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="bgColor">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">样品确定</block>
 		</cu-custom>
@@ -36,73 +36,119 @@
 					<u-input type="select" v-model="form.song_jian_shi_jia" @click="dateClick('inspect')" />
 				</u-form-item>
 
-				<u-form-item label="样本类型一">
-					<u-input type="select" v-model="form.yang_pin_lei_xing" @click="sheetClick('yangpinType1')" />
-				</u-form-item>
-				<u-form-item label="样本运输条件一">
-					<u-input type="select" v-model="form.yang_ben_yun_shu_" @click="sheetClick('transportType1')" />
-				</u-form-item>
-				<u-form-item label="数量一">
-					<u-number-box v-model="form.shu_liang_"></u-number-box>
-				</u-form-item>
-				<u-form-item label="样品规格一">
-					<u-input v-model="form.yang_pin_gui_ge_" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1')">规格
-					</u-button>
-				</u-form-item>
-
-
-				<u-form-item label="样本类型二">
-					<u-input type="select" v-model="form.yang_pin_lei_er_" @click="sheetClick('yangpinType2')" />
-				</u-form-item>
-				<u-form-item label="样本运输条件二">
-					<u-input type="select" v-model="form.yang_pin_yun_shu_" @click="sheetClick('transportType2')" />
-				</u-form-item>
-				<u-form-item label="数量二">
-					<u-number-box v-model="form.shu_liang_er_"> </u-number-box>
-				</u-form-item>
-				<u-form-item label="样品规格二">
-					<u-input v-model="form.yang_pin_gui_ge_e" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2')">规格
-					</u-button>
-				</u-form-item>
-
-				<u-form-item label="样本类型三">
-					<u-input type="select" v-model="form.yang_pin_lei_san_" @click="sheetClick('yangpinType3')" />
-				</u-form-item>
-				<u-form-item label="样本运输条件三">
-					<u-input type="select" v-model="form.yang_pin_yun_san" @click="sheetClick('transportType3')" />
-				</u-form-item>
-				<u-form-item label="数量三">
-					<u-number-box v-model="form.shu_liang_san_"></u-number-box>
-				</u-form-item>
-				<u-form-item label="样品规格三">
-					<u-input v-model="form.yang_pin_gui_ge_s" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3')">规格
-					</u-button>
-				</u-form-item>
-
-				<u-form-item label="样本类型四">
-					<u-input type="select" v-model="form.yang_pin_lei_si_" @click="sheetClick('yangpinType4')" />
-				</u-form-item>
-				<u-form-item label="样本运输条件四" required>
-					<u-input type="select" v-model="form.yang_pin_yun_si_" @click="sheetClick('transportType4')" />
-				</u-form-item>
-				<u-form-item label="数量四">
-					<u-number-box v-model="form.shu_liang_si_"></u-number-box>
-				</u-form-item>
-				<u-form-item label="样品规格四">
-					<u-input v-model="form.yang_pin_gui_si_" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4')">规格
-					</u-button>
-				</u-form-item>
-				<u-form-item label="项目名称" v-if="form.xiang_mu_ming_che != ''">
-					<u-input v-model="form.xiang_mu_ming_che" />
-				</u-form-item>
+				<view class="qingshe" @click="form.showBoolean1 = !form.showBoolean1">
+					<view>
+						②
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean1"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean1">
+					<u-form-item label="样本类型一">
+						<u-input type="select" v-model="form.yang_pin_lei_xing" @click="sheetClick('yangpinType1')" />
+					</u-form-item>
+					<u-form-item label="样本运输条件一">
+						<u-input type="select" v-model="form.yang_ben_yun_shu_" @click="sheetClick('transportType1')" />
+					</u-form-item>
+					<u-form-item label="数量一">
+						<u-number-box v-model="form.shu_liang_"></u-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格一">
+						<u-input v-model="form.yang_pin_gui_ge_" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1')">规格
+						</u-button>
+					</u-form-item>
+				</block>
+
+
+				<view class="qingshe" @click="form.showBoolean2 = !form.showBoolean2">
+					<view>
+						②
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean2">
+					<u-form-item label="样本类型②">
+						<u-input type="select" v-model="form.yang_pin_lei_er_" @click="sheetClick('yangpinType2')" />
+					</u-form-item>
+					<u-form-item label="样本运输条件②">
+						<u-input type="select" v-model="form.yang_pin_yun_shu_" @click="sheetClick('transportType2')" />
+					</u-form-item>
+					<u-form-item label="数量②">
+						<u-number-box v-model="form.shu_liang_er_"> </u-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格②">
+						<u-input v-model="form.yang_pin_gui_ge_e" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2')">规格
+						</u-button>
+					</u-form-item>
+				</block>
+
+
+				<view class="qingshe" @click="form.showBoolean3 = !form.showBoolean3">
+					<view>
+						③
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean3">
+					<u-form-item label="样本类③">
+						<u-input type="select" v-model="form.yang_pin_lei_san_" @click="sheetClick('yangpinType3')" />
+					</u-form-item>
+					<u-form-item label="样本运输条件③">
+						<u-input type="select" v-model="form.yang_pin_yun_san" @click="sheetClick('transportType3')" />
+					</u-form-item>
+					<u-form-item label="数量③">
+						<u-number-box v-model="form.shu_liang_san_"></u-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格③">
+						<u-input v-model="form.yang_pin_gui_ge_s" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3')">规格
+						</u-button>
+					</u-form-item>
+				</block>
+
+
+				<view class="qingshe" @click="form.showBoolean4 = !form.showBoolean4">
+					<view>
+						④
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="form.showBoolean4"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="form.showBoolean4">
+					<u-form-item label="样本类型④">
+						<u-input type="select" v-model="form.yang_pin_lei_si_" @click="sheetClick('yangpinType4')" />
+					</u-form-item>
+					<u-form-item label="样本运输条件④" required>
+						<u-input type="select" v-model="form.yang_pin_yun_si_" @click="sheetClick('transportType4')" />
+					</u-form-item>
+					<u-form-item label="数量④">
+						<u-number-box v-model="form.shu_liang_si_"></u-number-box>
+					</u-form-item>
+					<u-form-item label="样品规格④">
+						<u-input v-model="form.yang_pin_gui_si_" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4')">规格
+						</u-button>
+					</u-form-item>
+					<u-form-item label="项目名称" v-if="form.xiang_mu_ming_che != ''">
+						<u-input v-model="form.xiang_mu_ming_che" />
+					</u-form-item>
+				</block>
 
 
 				<u-form-item label="检测项目" label-position="top">
-					<view>
+					<view style="width: 100%;">
 						<view v-for="(it, x) in jianCeList" :key="x">
 							<view class="jiancexiangm">
 								<view>{{it.lei_bie_}}-{{it.jian_ce_xiang_mu_}}</view>
@@ -159,7 +205,12 @@
 					shu_liang_si_: 0,
 					yang_pin_yun_si_: '',
 					yang_pin_lei_si_: '',
-					xiang_mu_ming_che: ''
+					xiang_mu_ming_che: '',
+
+					showBoolean1: true,
+					showBoolean2: false,
+					showBoolean3: false,
+					showBoolean4: false,
 				},
 				jianCeList: [],
 				//日期
@@ -236,6 +287,19 @@
 							this.getJiangCeDe(result.jian_ce_xiang_mu_)
 						}
 
+						if (result.yang_pin_lei_xing != '') {
+							this.form.showBoolean1 = true
+						}
+						if (result.yang_pin_lei_er_ != '') {
+							this.form.showBoolean2 = true
+						}
+						if (result.yang_pin_lei_san_ != '') {
+							this.form.showBoolean3 = true
+						}
+						if (result.yang_pin_lei_si_ != '') {
+							this.form.showBoolean4 = true
+						}
+
 					}
 				})
 			},
@@ -392,8 +456,20 @@
 		height: auto;
 	}
 
+	.qingshe {
+		background-color: #f0f9eb;
+		color: #67c23a;
+		padding: 15rpx 20rpx;
+		border-radius: 8rpx;
+
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 25rpx;
+	}
+
 	.jiancexiangm {
-		// padding: 10rpx 30rpx;
+		padding: 10rpx 30rpx;
 		// width: 100%;
 		padding: 20rpx;
 		margin-bottom: 20rpx;

+ 12 - 12
pages/jiance/manyi.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">客户满意度调查</block>
 		</cu-custom>
@@ -125,17 +125,17 @@
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
 						const data = res.data.variables.data
-						data.forEach((item, index) => {
-							this.$set(item, 'value', item.ke_hu_ming_cheng_)
-							this.$set(item, 'text', item.lian_xi_ren_)
-						})
-						this.kehuXinXinList = data
-						this.buMenId = data[0].id_ || ''
-						this.buMenName = data[0].lian_xi_ren_
-						this.lianxidianhua = data[0].ke_hu_dian_hua_ || ''
-						this.keHuLianXiRen = data[0].lian_xi_ren_ || ''
-
-						if (data.length == 0) {
+						if (data.length > 0) {
+							data.forEach((item, index) => {
+								this.$set(item, 'value', item.ke_hu_ming_cheng_)
+								this.$set(item, 'text', item.lian_xi_ren_)
+							})
+							this.kehuXinXinList = data
+							this.buMenId = data[0].id_ || ''
+							this.buMenName = data[0].lian_xi_ren_
+							this.lianxidianhua = data[0].ke_hu_dian_hua_ || ''
+							this.keHuLianXiRen = data[0].lian_xi_ren_ || ''
+						} else {
 							uni.showToast({
 								title: '该账户暂时不能填写满意度调查,如果需要填写请联系本公司',
 								icon: 'none',

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 1093
pages/jiance/order - 备份.vue


+ 257 - 120
pages/jiance/order.vue

@@ -1,10 +1,11 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">检测委托</block>
 		</cu-custom>
-		<u-form :model="form" ref="form" label-width="220" :disabled="type == 'detail' ? true : false">
+		<u-form :model="form" ref="form" label-width="220" :error-type="errorType"
+			:disabled="type == 'detail' ? true : false">
 			<uni-group mode="card" title="委托信息">
 				<u-form-item label="委托类型">
 					<u-input v-model="form.weiTuoLeiXing" disabled />
@@ -34,7 +35,7 @@
 
 			</uni-group>
 
-			<uni-group mode="card" :title="'记录' + (index+1)" v-for="(item,index) in form.lhypb" :key="index">
+			<uni-group mode="card" :title="'样品' + (index+1)" v-for="(item,index) in form.lhypb" :key="index">
 				<u-form-item label="样品名称" prop="yangPinMingCheng" required>
 					<u-input v-model="item.yangPinMingCheng" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
@@ -42,7 +43,7 @@
 					<u-input v-model="item.yangPinBianHao" disabled />
 				</u-form-item>
 				<u-form-item label="姓名">
-					<u-input v-model="item.xingMing" />
+					<u-input v-model="item.xingMing" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="性别">
 					<u-radio-group v-model="item.xingBie" v-if="type != 'detail'">
@@ -69,101 +70,154 @@
 						v-if="type != 'detail'" />
 					<text v-else>{{item.songJianShiJian}}</text>
 				</u-form-item>
-
-				<u-form-item label="样本类型一">
-					<u-input type="select" v-model="item.yangPinLeiXing" @click="sheetClick('yangpinType1',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinLeiXing}}</text>
-				</u-form-item>
-				<u-form-item label="样本运输条件一">
-					<u-input type="select" v-model="item.yangBenYunShuTiao" @click="sheetClick('transportType1',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangBenYunShuTiao}}</text>
-				</u-form-item>
-				<u-form-item label="数量一">
-					<u-number-box v-model="item.shuLiang" v-if="type != 'detail'"></u-number-box>
-					<text v-else>{{item.shuLiang}}</text>
-				</u-form-item>
-				<u-form-item label="样品规格一">
-					<u-input v-model="item.yangPinGuiGe" v-if="type != 'detail'" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1',index)"
-						v-if="type != 'detail'">规格
-					</u-button>
-					<text v-else>{{item.yangPinGuiGe}}</text>
-				</u-form-item>
-
-
-				<u-form-item label="样本类型二">
-					<u-input type="select" v-model="item.yangPinLeiXingEr" @click="sheetClick('yangpinType2',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinLeiXingEr}}</text>
-				</u-form-item>
-				<u-form-item label="样本运输条件二">
-					<u-input type="select" v-model="item.yangPinYunShuTiao" @click="sheetClick('transportType2',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinYunShuTiao}}</text>
-				</u-form-item>
-				<u-form-item label="数量二">
-					<u-number-box v-model="item.shuLiangEr" v-if="type != 'detail'"></u-number-box>
-					<text v-else>{{item.shuLiangEr}}</text>
-				</u-form-item>
-				<u-form-item label="样品规格二">
-					<u-input v-model="item.yangPinGuiGeEr" v-if="type != 'detail'" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2',index)"
-						v-if="type != 'detail'">规格
-					</u-button>
-					<text v-else>{{item.yangPinGuiGeEr}}</text>
+				<u-form-item label="送样要求">
+					<u-input v-model="item.songYangYaoQiu" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 
-				<u-form-item label="样本类型三">
-					<u-input type="select" v-model="item.yangPinLeiXingSan" @click="sheetClick('yangpinType3',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinLeiXingSan}}</text>
-				</u-form-item>
-				<u-form-item label="样本运输条件三">
-					<u-input type="select" v-model="item.yangPinYunShuSan" @click="sheetClick('transportType3',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinLeiXingSan}}</text>
-				</u-form-item>
-				<u-form-item label="数量三">
-					<u-number-box v-model="item.shuLiangSan" v-if="type != 'detail'"></u-number-box>
-					<text v-else>{{item.shuLiangSan}}</text>
-				</u-form-item>
-				<u-form-item label="样品规格三">
-					<u-input v-model="item.yangPinGuiGeSan" v-if="type != 'detail'" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3',index)"
-						v-if="type != 'detail'">规格
-					</u-button>
-					<text v-else>{{item.yangPinGuiGeSan}}</text>
-				</u-form-item>
-
-				<u-form-item label="样本类型四">
-					<u-input type="select" v-model="item.yangPinLeiXingSi" @click="sheetClick('yangpinType4',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinLeiXingSi}}</text>
-				</u-form-item>
-				<u-form-item label="样本运输条件四" required>
-					<u-input type="select" v-model="item.yangPinYunShuSi" @click="sheetClick('transportType4',index)"
-						v-if="type != 'detail'" />
-					<text v-else>{{item.yangPinYunShuSi}}</text>
-				</u-form-item>
-				<u-form-item label="数量四">
-					<u-number-box v-model="item.shuLiangSi" v-if="type != 'detail'"></u-number-box>
-					<text v-else>{{item.shuLiangSi}}</text>
-				</u-form-item>
-				<u-form-item label="样品规格四">
-					<u-input v-model="item.yangPinGuiGeSi" v-if="type != 'detail'" />
-					<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4',index)"
-						v-if="type != 'detail'">规格
-					</u-button>
-					<text v-else>{{item.yangPinGuiGeSi}}</text>
-				</u-form-item>
-				<u-form-item label="项目名称" prop="xiangMuMingCheng" v-if="form.weiTuoHeTong == '技术服务协议'">
-					<u-input v-model="item.xiangMuMingCheng" :disabled="type == 'detail'?true :false" />
-				</u-form-item>
+				<view class="qingshe" @click="item.showBoolean1 = !item.showBoolean1">
+					<view>
+						①
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="item.showBoolean1"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="item.showBoolean1">
+					<u-form-item label="样本类型①">
+						<u-input type="select" v-model="item.yangPinLeiXing" @click="sheetClick('yangpinType1',index)"
+							v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinLeiXing}}</text>
+					</u-form-item>
+					<u-form-item label="样本运输条件①">
+						<u-input type="select" v-model="item.yangBenYunShuTiao"
+							@click="sheetClick('transportType1',index)" v-if="type != 'detail'" />
+						<text v-else>{{item.yangBenYunShuTiao}}</text>
+					</u-form-item>
+					<u-form-item label="数量①">
+						<!-- <u-number-box v-model="item.shuLiang" v-if="type != 'detail'"></u-number-box> -->
+						<uni-number-box v-model="item.shuLiang" v-if="type != 'detail'"></uni-number-box>
+						<text v-else>{{item.shuLiang}}</text>
+					</u-form-item>
+					<u-form-item label="样品规格①">
+						<u-input v-model="item.yangPinGuiGe" v-if="type != 'detail'" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1',index)"
+							v-if="type != 'detail'">规格
+						</u-button>
+						<text v-else>{{item.yangPinGuiGe}}</text>
+					</u-form-item>
+				</block>
+
+				<view class="qingshe" @click="item.showBoolean2 = !item.showBoolean2">
+					<view>
+						②
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="item.showBoolean2"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="item.showBoolean2">
+					<u-form-item label="样本类型②">
+						<u-input type="select" v-model="item.yangPinLeiXingEr" @click="sheetClick('yangpinType2',index)"
+							v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinLeiXingEr}}</text>
+					</u-form-item>
+					<u-form-item label="样本运输条件②">
+						<u-input type="select" v-model="item.yangPinYunShuTiao"
+							@click="sheetClick('transportType2',index)" v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinYunShuTiao}}</text>
+					</u-form-item>
+					<u-form-item label="数量②">
+						<!-- <u-number-box v-model="item.shuLiangEr" v-if="type != 'detail'"></u-number-box> -->
+						<uni-number-box v-model="item.shuLiangEr" v-if="type != 'detail'"></uni-number-box>
+						<text v-else>{{item.shuLiangEr}}</text>
+					</u-form-item>
+					<u-form-item label="样品规格②">
+						<u-input v-model="item.yangPinGuiGeEr" v-if="type != 'detail'" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2',index)"
+							v-if="type != 'detail'">规格
+						</u-button>
+						<text v-else>{{item.yangPinGuiGeEr}}</text>
+					</u-form-item>
+				</block>
+
+				<view class="qingshe" @click="item.showBoolean3 = !item.showBoolean3">
+					<view>
+						③
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="item.showBoolean3"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="item.showBoolean3">
+					<u-form-item label="样本类型③">
+						<u-input type="select" v-model="item.yangPinLeiXingSan"
+							@click="sheetClick('yangpinType3',index)" v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinLeiXingSan}}</text>
+					</u-form-item>
+					<u-form-item label="样本运输条件③">
+						<u-input type="select" v-model="item.yangPinYunShuSan"
+							@click="sheetClick('transportType3',index)" v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinLeiXingSan}}</text>
+					</u-form-item>
+					<u-form-item label="数量③">
+						<!-- <u-number-box v-model="item.shuLiangSan" v-if="type != 'detail'"></u-number-box> -->
+						<uni-number-box v-model="item.shuLiangSan" v-if="type != 'detail'"></uni-number-box>
+						<text v-else>{{item.shuLiangSan}}</text>
+					</u-form-item>
+					<u-form-item label="样品规格③">
+						<u-input v-model="item.yangPinGuiGeSan" v-if="type != 'detail'" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3',index)"
+							v-if="type != 'detail'">规格
+						</u-button>
+						<text v-else>{{item.yangPinGuiGeSan}}</text>
+					</u-form-item>
+				</block>
+
+				<view class="qingshe" @click="item.showBoolean4 = !item.showBoolean4">
+					<view>
+						④
+					</view>
+					<view>
+						<u-icon name="arrow-up" v-if="item.showBoolean4"></u-icon>
+						<u-icon name="arrow-down" v-else></u-icon>
+					</view>
+				</view>
+				<block v-if="item.showBoolean4">
+					<u-form-item label="样本类型④">
+						<u-input type="select" v-model="item.yangPinLeiXingSi" @click="sheetClick('yangpinType4',index)"
+							v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinLeiXingSi}}</text>
+					</u-form-item>
+					<u-form-item label="样本运输条件④">
+						<u-input type="select" v-model="item.yangPinYunShuSi"
+							@click="sheetClick('transportType4',index)" v-if="type != 'detail'" />
+						<text v-else>{{item.yangPinYunShuSi}}</text>
+					</u-form-item>
+					<u-form-item label="数量④">
+						<!-- <u-number-box v-model="item.shuLiangSi" v-if="type != 'detail'"></u-number-box> -->
+						<uni-number-box v-model="item.shuLiangSi" v-if="type != 'detail'"></uni-number-box>
+						<text v-else>{{item.shuLiangSi}}</text>
+					</u-form-item>
+					<u-form-item label="样品规格④">
+						<u-input v-model="item.yangPinGuiGeSi" v-if="type != 'detail'" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4',index)"
+							v-if="type != 'detail'">规格
+						</u-button>
+						<text v-else>{{item.yangPinGuiGeSi}}</text>
+					</u-form-item>
+					<u-form-item label="项目名称" prop="xiangMuMingCheng" v-if="form.weiTuoHeTong == '技术服务协议'">
+						<u-input v-model="item.xiangMuMingCheng" :disabled="type == 'detail'?true :false" />
+					</u-form-item>
+					<u-form-item label="样品总价" prop="yangPinZongJia">
+						<u-input v-model="item.yangPinZongJia" disabled />
+					</u-form-item>
+				</block>
 
 				<u-form-item label="检测类型" v-if="type != 'detail'">
-					<u-input type="select" v-model="item.jianCeType" @click="sheetClick('jianCeType',index)" />
+					<u-input type="select" v-model="item.jianCeType" @click="selectClick('jianCeType',index)" />
 				</u-form-item>
 
 				<u-form-item label="检测项目" prop="name" label-position="top">
@@ -175,8 +229,10 @@
 								<checkbox :checked="it.checked" :value="it.id_" />
 							</view>
 							<view style="margin-left: 10rpx;">
-								<view>{{it.jian_ce_lei_bie_}}-{{it.jian_ce_xiang_mu_}}</view>
-								<view>{{it.yi_ju_de_biao_zhu}}</view>
+								<view>
+									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.xiang_mu_dan_jia_ || '0'}}]
+								</view>
+								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
 							</view>
 						</label>
 					</checkbox-group>
@@ -184,19 +240,21 @@
 						<view class="uni-list-cell uni-list-cell-pd">
 							<view
 								style="margin-left: 10rpx;font-size: 20rpx;line-height: 40rpx;background: #eee;padding: 10rpx;">
-								<view>{{it.jian_ce_lei_bie_}}-{{it.jian_ce_xiang_mu_}}</view>
-								<view>{{it.yi_ju_de_biao_zhu}}</view>
+								<view>
+									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.xiang_mu_dan_jia_ || ''}}]
+								</view>
+								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
 							</view>
 						</view>
 					</view>
 
 				</u-form-item>
 
-				<u-button type="error" class="btn" @click="deletSing(index)" v-if="type != 'detail'">删除记录{{index+1}}
+				<u-button type="error" class="btn" @click="deletSing(index)" v-if="type != 'detail'">删除样品{{index+1}}
 				</u-button>
 			</uni-group>
 
-			<u-button type="success" class="btn" @click="getSing()" v-if="type != 'detail'">添加记录</u-button>
+			<u-button type="success" class="btn" @click="getSing()" v-if="type != 'detail'">添加样品</u-button>
 
 			<uni-group mode="card">
 				<u-form-item label="付款方式">
@@ -218,7 +276,7 @@
 					</u-radio-group>
 					<text v-else>{{getButtChange(form.chuJuBaoGaoYaoQiu,reportRequireList)}}</text>
 				</u-form-item>
-				<u-form-item label="出报告时间">
+				<u-form-item label="出报告时间" prop="chuBaoGaoShiJian" required>
 					<u-input type="select" v-model="form.chuBaoGaoShiJian" @click="dateClick('report')"
 						v-if="type != 'detail'" />
 					<text v-else>{{form.chuBaoGaoShiJian}}</text>
@@ -234,13 +292,13 @@
 			</uni-group>
 
 			<uni-group mode="card" title="委托人信息">
-				<u-form-item label="委托方">
+				<u-form-item label="委托方" prop="weiTuoFangMingChe" required>
 					<u-input v-model="form.weiTuoFangMingChe" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
-				<u-form-item label="联系人">
+				<u-form-item label="联系人" prop="weiTuoFangLianXiR" required>
 					<u-input v-model="form.weiTuoFangLianXiR" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
-				<u-form-item label="联系电话">
+				<u-form-item label="联系电话" prop="weiTuoFangLianXiD" required>
 					<u-input v-model="form.weiTuoFangLianXiD" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="委托日期" prop="weiTuoRiQi">
@@ -277,6 +335,7 @@
 
 		<u-calendar v-model="dateShow" :mode="mode" max-date="2050-01-01" @change="dateChange"></u-calendar>
 		<u-action-sheet :list="list" v-model="sheetShow" @click="actionSheetCallback"></u-action-sheet>
+		<u-select v-model="selectShow" :list="list" @confirm="selectConfirm"></u-select>
 
 		<u-popup mode="center" v-model="popupShow">
 			<view style="padding: 30rpx;background: #FFFFFF;width: 100%;">
@@ -316,8 +375,8 @@
 					qiWangWanChengShi: '',
 					lhypb: [],
 					fuKuanFangShi: '',
-					baoGaoLeiXing: '',
-					chuJuBaoGaoYaoQiu: '',
+					baoGaoLeiXing: '简易',
+					chuJuBaoGaoYaoQiu: '常规',
 					chuBaoGaoShiJian: '',
 					yangBenChuLi: '',
 					weiTuoFangMingChe: '',
@@ -343,8 +402,34 @@
 						required: true,
 						message: '请选择样本处理',
 						trigger: ['change', 'blur'],
-					}]
+					}],
+					chuBaoGaoShiJian: [{
+						required: true,
+						message: '请输入出报告时间',
+						trigger: 'blur',
+					}],
+					weiTuoFangMingChe: [{
+						required: true,
+						message: '请输入委托方',
+						trigger: 'blur',
+					}],
+					weiTuoFangLianXiD: [{
+						required: true,
+						message: '请输入联系电话',
+						trigger: 'blur',
+					}],
+					weiTuoFangLianXiR: [{
+						required: true,
+						message: '请输入联系人',
+						trigger: 'blur',
+					}],
+					weiTuoFangQueRen: [{
+						required: true,
+						message: '请委托人签名',
+						trigger: 'blur',
+					}],
 				},
+				errorType: ['toast'],
 
 
 				//日期
@@ -381,6 +466,7 @@
 				//账号id
 				userid: '',
 				time: '',
+				time2: '', //有时分秒
 				orgId: '',
 
 				//合同
@@ -396,7 +482,8 @@
 				id: '', //委托单id
 				taskId: '',
 				total: 0,
-				popupShow: false
+				popupShow: false,
+				selectShow: false
 
 
 			}
@@ -461,9 +548,12 @@
 				//获取时间
 				let nowDate = new Date((new Date).getTime() + 8 * 60 * 60 * 1000)
 				let time = nowDate.toJSON().split('T').join(' ').substr(0, 10)
+				let time2 = nowDate.toJSON().split('T').join(' ').substr(0, 19)
 				this.time = time
+				this.time2 = time2
 
 				this.form.weiTuoLeiXing = '客户委托'
+				this.form.weiTuoRiQi = this.time
 			},
 			//根据暂存id获取暂存详情信息
 			getSaveData(id) {
@@ -554,7 +644,7 @@
 			//获取样品
 			getYangPin(id) {
 				let sql =
-					`select  * from  t_lhypb  where parent_id_ = '${id}'`
+					`select  * from  t_lhypb  where parent_id_ = '${id}' order by yang_pin_bian_hao asc`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
@@ -623,18 +713,24 @@
 					if (res.data.state == 200) {
 						let result = res.data.variables.data
 						if (result.length > 0) {
+
 							result.forEach((item, index) => {
+
 								if (this.jianCeTypeList.length == 0) {
 									let obj = {
-										text: item.jian_ce_lei_bie_
+										// text: item.jian_ce_lei_bie_
+										value: item.jian_ce_lei_bie_,
+										label: item.jian_ce_lei_bie_
 									}
 									this.jianCeTypeList.push(obj)
 								} else {
-									let gg = this.jianCeTypeList.findIndex(it => it.text == item
+									let gg = this.jianCeTypeList.findIndex(it => it.value == item
 										.jian_ce_lei_bie_)
 									if (gg < 0) {
 										let obj = {
-											text: item.jian_ce_lei_bie_
+											// text: item.jian_ce_lei_bie_
+											value: item.jian_ce_lei_bie_,
+											label: item.jian_ce_lei_bie_
 										}
 										this.jianCeTypeList.push(obj)
 									}
@@ -667,11 +763,14 @@
 			getTotal() {
 				var total = 0
 				this.form.lhypb.forEach((item, index) => {
+					let itemTotal = 0
 					item.jianCeList.forEach((it, x) => {
 						if (it.checked) {
 							total += parseInt(it.zhe_hou_jia_ge_)
+							itemTotal += parseInt(it.zhe_hou_jia_ge_)
 						}
 					})
+					item.yangPinZongJia = itemTotal
 				})
 				this.form.zongJia = total
 				this.total = total
@@ -745,10 +844,7 @@
 					this.list = this.dispositionList
 				}
 
-				if (type == 'jianCeType') {
-					this.list = this.jianCeTypeList
-					this.listIndex = index
-				}
+
 			},
 			//下拉框回调
 			actionSheetCallback(e) {
@@ -807,8 +903,21 @@
 					this.form.yangBenChuLi = this.list[e].text
 				}
 
+			},
+			selectClick(type, index) {
+				this.listType = type
+				this.selectShow = true
+				if (type == 'jianCeType') {
+					this.list = this.jianCeTypeList
+					this.listIndex = index
+				}
+			},
+			selectConfirm(e) {
+				console.log(e)
+				let that = this
+				let lists = that.form.lhypb[this.listIndex]
 				if (this.listType == 'jianCeType') {
-					lists.jianCeType = that.list[e].text
+					lists.jianCeType = e[0].value
 				}
 			},
 
@@ -856,6 +965,10 @@
 
 
 				this.form.lhypb.forEach((item, index) => {
+					item.weiTuoDanHao = this.form.weiTuoBianHao
+					item.weiTuoDanWei = this.form.weiTuoDanWei
+					item.lianXiRen = this.form.weiTuoFangLianXiR
+					item.lianXiDianHua = this.form.weiTuoFangLianXiD
 					item.jianCeList.forEach((it, x) => {
 						if (it.checked) {
 							item.jianCeXiangMu2.push(it.id_)
@@ -986,7 +1099,7 @@
 								dui_ying_shu_ju_b: 't_lhwtsqb',
 								bao_cun_biao_ti_: '委托单',
 								zhuang_tai_: '未完成',
-								bian_zhi_shi_jian: this.time,
+								bian_zhi_shi_jian: this.time2,
 								bian_zhi_ren_: this.userid
 							}
 							list.push(obj)
@@ -1044,6 +1157,7 @@
 						songJianPiHao: '',
 						yangPinZhuangTai: '',
 						songJianShiJian: '',
+						songYangYaoQiu: '',
 
 						yangPinLeiXing: '',
 						yangBenYunShuTiao: '',
@@ -1067,7 +1181,18 @@
 						jianCeList: JSON.parse(JSON.stringify(this.jianCeList)),
 						jianCeType: this.jianCeTypeList[0].text,
 
-						xiangMuMingCheng: ''
+						xiangMuMingCheng: '',
+						yangPinZongJia: '',
+
+						lianXiDianHua: '',
+						lianXiRen: '',
+						weiTuoDanWei: '',
+						weiTuoDanHao: '',
+
+						showBoolean1: true,
+						showBoolean2: false,
+						showBoolean3: false,
+						showBoolean4: false,
 					}
 					this.form.lhypb.push(obj)
 				})
@@ -1145,6 +1270,18 @@
 		margin: 15rpx
 	}
 
+	.qingshe {
+		background-color: #f0f9eb;
+		color: #67c23a;
+		padding: 15rpx 20rpx;
+		border-radius: 8rpx;
+
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 25rpx;
+	}
+
 	/deep/ .uni-group__content {
 		padding: 15rpx 25rpx;
 	}

+ 20 - 1
pages/jiance/order/meth.js

@@ -48,6 +48,7 @@ export default {
 				songJianPiHao: item.song_jian_pi_hao_,
 				yangPinZhuangTai: item.yang_pin_zhuang_t,
 				songJianShiJian: item.song_jian_shi_jia,
+				songYangYaoQiu: item.song_yang_yao_qiu,
 
 				yangPinLeiXing: item.yang_pin_lei_xing,
 				yangBenYunShuTiao: item.yang_ben_yun_shu_,
@@ -71,7 +72,25 @@ export default {
 				jianCeList: jiancLis,
 				jianCeType: '',
 
-				xiangMuMingCheng: item.xiang_mu_ming_che
+				xiangMuMingCheng: item.xiang_mu_ming_che,
+				yangPinZongJia: item.yang_pin_zong_jia,
+
+				showBoolean1: true,
+				showBoolean2: false,
+				showBoolean3: false,
+				showBoolean4: false,
+			}
+			if (obj.yangPinLeiXing != '') {
+				obj.showBoolean1 = true
+			}
+			if (obj.yangPinLeiXingEr != '') {
+				obj.showBoolean2 = true
+			}
+			if (obj.yangPinLeiXingSan != '') {
+				obj.showBoolean3 = true
+			}
+			if (obj.yangPinLeiXingSi != '') {
+				obj.showBoolean4 = true
 			}
 			TList.push(obj)
 		})

+ 8 - 8
pages/jiance/order/test.json

@@ -64,21 +64,21 @@
 		"name": "女"
 	}],
 	"specification": [{
-		"text": "__支*__ml(规格)*__ml离心管"
+		"text": "__ml(规格)*__ml离心管"
 	}, {
-		"text": "__支*__ml(规格)*冻存管"
+		"text": "__ml(规格)*冻存管"
 	}, {
-		"text": "__支*__ml(规格)*冻存袋"
+		"text": "__ml(规格)*冻存袋"
 	}, {
-		"text": "__支*__ml(规格)*玻璃管"
+		"text": "__ml(规格)*玻璃管"
 	}, {
-		"text": "__支*__ml(规格)*玻璃瓶"
+		"text": "__ml(规格)*玻璃瓶"
 	}, {
-		"text": "__支*__ml(规格)*EP管"
+		"text": "__ml(规格)*EP管"
 	}, {
-		"text": "__支*__ml(规格)*采血管"
+		"text": "__ml(规格)*采血管"
 	}, {
-		"text": "其它:数量*容量*包装类型"
+		"text": "其它:容量*包装类型"
 	}],
 	"disposition": [{
 		"text": "按照检测方样本管理规程处理"

+ 229 - 29
pages/jiance/tousu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">客户投诉</block>
 		</cu-custom>
@@ -11,48 +11,89 @@
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">电话</view>
-			<input v-model="form.telephone" name="input" placeholder="请输入电话">
+			<input v-model="form.telephone" name="input" placeholder="请输入电话" :disabled="id != '' ? true : false">
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">投诉单位</view>
-			<input v-model="form.company" name="input" placeholder="请输入投诉单位">
+			<input v-model="form.company" name="input" placeholder="请输入投诉单位" :disabled="id != '' ? true : false">
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">投诉日期</view>
-			<input v-model="form.touSuRiQi" name="input" placeholder="请输入投诉日期" disabled @click="show = true">
+			<input v-model="form.touSuRiQi" name="input" placeholder="请输入投诉日期" disabled @click="showClick">
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">邮编</view>
-			<input v-model="form.postcode" name="input" placeholder="请输入邮编">
+			<input v-model="form.postcode" name="input" placeholder="请输入邮编" :disabled="id != '' ? true : false">
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">地址</view>
-			<input v-model="form.address" name="input" placeholder="请输入地址">
+			<input v-model="form.address" name="input" placeholder="请输入地址" :disabled="id != '' ? true : false">
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">投诉方式</view>
-			<input v-model="form.complaintsWay" name="input" placeholder="请输入投诉方式" disabled @click="selectShow = true">
+			<input v-model="form.complaintsWay" name="input" placeholder="请输入投诉方式" disabled @click="selectShowClick">
 		</view>
 
 		<uni-section title="投诉内容" type="line" padding>
-			<textarea maxlength="-1" v-model="form.content" placeholder="投诉内容"></textarea>
+			<textarea maxlength="-1" v-model="form.content" placeholder="投诉内容"
+				:disabled="id != '' ? true : false"></textarea>
 		</uni-section>
 
 		<uni-section title="上传附件" type="line">
-			<view class="example-body">
+			<view class="example-body" v-if="id == ''">
 				<uni-file-picker limit="5" file-mediatype="all" @select="select" @progress="progress" @success="success"
 					@fail="fail" @delete="deleteMe" :auto-upload="false" ref="uploadMe"></uni-file-picker>
 			</view>
+			<view v-else>
+				<view v-for="(item,index) in fuJianShangChuanArray" :key="index" style="margin: 0 10rpx;">
+					<view style="line-height: 50rpx;">{{item.fileName}}</view>
+				</view>
+			</view>
+		</uni-section>
+		<uni-section title="客户确认" type="line">
+			<u-radio-group v-model="form.shiFouTongYi" v-if="id != ''" style="margin: 0 10rpx;">
+				<u-radio v-for="(it, index) in sexList" :key="index" :name="it.name">
+					{{it.name}}
+				</u-radio>
+			</u-radio-group>
+		</uni-section>
+
+		<uni-section title="投诉内容" type="line" padding v-if="id != ''">
+			<view style="width: 100%;">
+				<view style="text-align: right;width: 100%;">
+					<view v-if="id != ''">
+						<u-button type="primary" size="mini" @click="qianming(0)">
+							签名</u-button>
+						<u-button type="primary" size="mini" @click="deqianming(0)" style="margin-left: 15rpx;"
+							v-if="form.qianMing != ''">
+							取消</u-button>
+					</view>
+				</view>
+				<view style="width: 100%;" v-if="form.qianMing != ''">
+					<image :src="form.qianMing" style="width: 100%;height: 500rpx;border: 1px #eee solid;">
+					</image>
+				</view>
+			</view>
 		</uni-section>
 
 
 		<view class="padding flex flex-direction">
-			<button class="cu-btn bg-blue lg" @click="onSubmit">提交</button>
+			<button class="cu-btn bg-blue lg" @click="onSubmit" v-if="id == ''">提交</button>
+			<button class="cu-btn bg-blue lg" @click="getArgee()" v-else>签名确认</button>
 		</view>
 
 
 		<u-calendar v-model="show" :mode="mode" @change="dateChange"></u-calendar>
 		<u-select v-model="selectShow" :list="list" title="投诉方式" @confirm="selecConfirm"></u-select>
+
+		<u-popup mode="center" v-model="popupShow">
+			<view style="padding: 30rpx;background: #FFFFFF;width: 100%;">
+				<view class="cu-form-group ">
+					<view class="title">签名</view>
+				</view>
+				<autograph @save="save" @clear="clear" @close="close"></autograph>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -66,12 +107,13 @@
 	import appSelect from '@/components/my-componets/appSelect.vue'
 	import myDate from '@/components/my-componets/my-date.vue'
 	import test from './tousu/list.json'
+	import autograph from '@/components/autograph/autograph'
 
 	export default {
 		components: {
 			myDate,
 			appSelect,
-
+			autograph
 		},
 		data() {
 			return {
@@ -83,7 +125,9 @@
 
 				buMenList: [],
 				fuJianShangChuanArray: [],
+				popupShow: false,
 
+				id: '',
 				form: {
 					ComplainantsName: "",
 					Complainants: "",
@@ -102,7 +146,7 @@
 					chuLiShiJian: "",
 					chuLiJieGuoShiFou: "",
 					shiFouTongYi: "",
-					keHuQianMing: "",
+					qianMing: "",
 					bianZhiRen: "",
 					bianZhiSJ: "",
 					bianZhiBuMen: "",
@@ -119,22 +163,20 @@
 					shouLiRiQi2: "",
 					shouLiBuMen2: "",
 					qianMingRiQi: ""
-				}
+				},
+				sexList: [{
+					name: "同意"
+				}, {
+					name: "不同意"
+				}]
 			}
 		},
-		onLoad() {
-			// let that = this
-			// this.$http.post("/ibps/business/v3/common/queryBuMenList", "466555896126767104").then(res => {
-			// 	if (res.data.state == 200 && res.data.data) {
-			// 		this.buMenList = []
-			// 		for (let ind in res.data.data) {
-			// 			this.buMenList.push({
-			// 				value: res.data.data[ind].id,
-			// 				text: res.data.data[ind].buMenMingChengs
-			// 			})
-			// 		}
-			// 	}
-			// });
+		onLoad(options) {
+			if (options.id) {
+				this.id = options.id
+				this.getTaskId(this.id)
+				this.getDe(this.id)
+			}
 		},
 		created() {
 			let info = uni.getStorageSync(USER_INFO);
@@ -144,6 +186,93 @@
 			this.form.ComplainantsName = name
 		},
 		methods: {
+			//根据投诉id查询 taskId
+			getTaskId(id) {
+				let sql =
+					`select TASK_ID_ from ibps_bpm_tasks where NAME_ = '客户确认' and NODE_ID_ = 'Activity_1sdpied' and PROC_DEF_KEY_ = 'Process_1ydqnej' and EXEC_ID_ = (select PROC_INST_ID_ from act_ru_execution where ACT_ID_ = 'Activity_1sdpied' and BUSINESS_KEY_ = '${id}') ORDER BY CREATE_TIME_ desc`
+
+				let requestData = this.$sig(sql)
+
+				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
+					if (res.data.state == 200) {
+						if (res.data.variables.data.length > 0) {
+							let result = res.data.variables.data[0]
+							if (result.TASK_ID_) {
+								this.taskId = result.TASK_ID_
+							}
+						}
+
+
+					}
+				})
+			},
+			//查投诉详情
+			getDe(id) {
+				let sql =
+					`select a.*,b.name_ from t_complaint a left join ibps_party_employee b on a.complainants_ = b.id_ where a.id_ = '${id}'`
+
+				let requestData = this.$sig(sql)
+				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
+					if (res.data.state == 200) {
+						const data = res.data.variables.data[0]
+						this.form.id = data.id_
+						this.form.ComplainantsName = data.name_
+						this.form.Complainants = data.complainants_
+						this.form.telephone = data.telephone_
+						this.form.postcode = data.postcode_
+						this.form.company = data.company_
+						this.form.touSuRiQi = data.tou_su_ri_qi_
+						this.form.address = data.address_
+						this.form.complaintsWay = data.complaints_way_
+						this.form.content = data.content_
+						this.form.yeShu = data.ye_shu_
+						this.form.fuJianShangChuan = data.fu_jian_shang_chu
+						this.form.youWuYouXiaoTouSu = data.you_wu_you_xiao_
+						this.form.officeSurvey = data.office_survey_
+						this.form.chuLiCuoShi = data.chu_li_cuo_shi_
+						this.form.chuLiShiJian = data.chu_li_shi_jian_
+						this.form.chuLiJieGuoShiFou = data.chu_li_jie_guo_sh
+						this.form.shiFouTongYi = data.shi_fou_tong_yi_
+						this.form.bianZhiRen = data.bian_zhi_ren_
+						this.form.bianZhiSJ = data.bian_zhi_sj_
+						this.form.bianZhiBuMen = data.bian_zhi_bu_men_
+						this.form.acceptor = data.acceptor_
+						this.form.acceptanceDate = data.acceptance_date_
+						this.form.shouLiBuMen = data.shou_li_bu_men_
+						this.form.zeRenBuMenFuZeRen = data.ze_ren_bu_men_fu_
+						this.form.zeRenShouLiRiQi = data.ze_ren_shou_li_ri
+						this.form.zeRenBuMen = data.zhi_liang_bu_men_
+						this.form.zhiLiangFuZeRen = data.zhi_liang_fu_ze_r
+						this.form.zhiLiangRiQi = data.zhi_liang_ri_qi_
+						this.form.zhiLiangBuMen = data.zhi_liang_bu_men_
+						this.form.shouLiRen2 = data.shou_li_ri_qi_2_
+						this.form.shouLiRiQi2 = data.shou_li_ren_2_
+						this.form.shouLiBuMen2 = data.shou_li_bu_men_2_
+						if (data.fu_jian_shang_chu && data.fu_jian_shang_chu != '') {
+							this.getFileList(data.fu_jian_shang_chu)
+						}
+						uni.hideLoading()
+					}
+				})
+			},
+			getFileList(ids) {
+				let lists = ids.split(",")
+				let params = {}
+				params.ids = lists
+				this.$http.post("/ibps/platform/v3/file/attachment/transfer", params).then(res => {
+					if (res.data.state == 200) {
+						const data = res.data.data
+						lists.forEach(item => {
+							let obj = {
+								id: item,
+								fileName: data[item].fileName
+							}
+							this.fuJianShangChuanArray.push(obj)
+						})
+
+					}
+				})
+			},
 			// 获取上传状态
 			select(file) {
 				//读取文件大小
@@ -161,7 +290,8 @@
 				let that = this
 				for (let e in file.tempFilePaths) {
 					console.log("000", file.tempFiles[e].file)
-					var extName = file.tempFiles[e].file.name.substring(file.tempFiles[e].file.name.lastIndexOf('.'));
+					var extName = file.tempFiles[e].file.name.substring(file.tempFiles[e].file.name.lastIndexOf(
+						'.'));
 					const path = file.tempFilePaths[e];
 					uni.uploadFile({
 						// url: http.apiHosp + 'ibps/platform/v3/file/upload/mobile', //仅为示例,非真实的接口地址
@@ -251,16 +381,86 @@
 						})
 					}
 				}).catch((err) => {
-					let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误,请稍后再试"
+					let msg = ((err.response || {}).data || {}).message || err.data.message ||
+						"请求出现错误,请稍后再试"
 					this.$tip.error(msg);
 				});
 			},
+			//签名确定
+			getArgee() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				});
+				let info = uni.getStorageSync(USER_INFO);
+				let useId = info.user.id
+				var nowDate = new Date((new Date).getTime() + 8 * 60 * 60 * 1000)
+				var time = nowDate.toJSON().split('T').join(' ').substr(0, 10);
+
+				this.form.qianMingRiQi = time
+				this.form.shiFouGuoShen = '1'
+				let editData = {
+					data: JSON.stringify(this.form),
+					opinion: '',
+					taskId: this.taskId
+				}
+				this.$http.post("/ibps/business/v3/bpm/task/agree", editData).then(res => {
+					if (res.data.state == 200) {
+						this.$tip.success('提交成功!')
+						uni.hideLoading();
+						this.$Router.replaceAll({
+							name: 'index'
+						})
+					} else {
+						this.$tip.success('提交异常!')
+						this.$Router.replaceAll({
+							name: 'index'
+						})
+					}
+				});
+			},
 			dateChange(e) {
 				this.form.touSuRiQi = e.result
 			},
 			selecConfirm(e) {
 				this.form.complaintsWay = e[0].value
-			}
+			},
+			selectShowClick() {
+				if (this.id == '') {
+					this.selectShow = true
+				}
+			},
+			showClick() {
+				if (this.id == '') {
+					this.show = true
+				}
+			},
+			//弹出框显示
+			qianming(index) {
+				this.qianshow = true
+				this.qianIndex = index
+				this.popupShow = true
+			},
+			//清除签名
+			deqianming(index) {
+				if (index == 0) {
+					this.form.qianMing = ''
+				}
+			},
+			//保存签名
+			save(val) {
+				if (this.qianIndex == 0) {
+					this.form.qianMing = val
+				}
+				this.qianshow = false
+				this.popupShow = false
+			},
+			//清除签名
+			clear(val) {
+				if (this.qianIndex == 0) {
+					this.form.qianMing = ''
+				}
+			},
 		}
 	}
 </script>

+ 116 - 0
pages/jiance/tousu/tousuList.vue

@@ -0,0 +1,116 @@
+<template>
+	<view class="container">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">投诉列表</block>
+		</cu-custom>
+
+		<block v-if="list.length > 0">
+			<view v-for="(item,index) in list" :key="index" style="margin: 10rpx 20rpx;">
+				<uni-section :title="'投诉人:'+item.name_" type="line" padding>
+					<view style="display: flex;align-items: center;">
+						<view>电话:</view>
+						<view>{{item.telephone_}} </view>
+					</view>
+					<view style="display: flex;align-items: center;">
+						<view>投诉单位:</view>
+						<view>{{item.company_}} </view>
+					</view>
+					<view style="display: flex;align-items: center;">
+						<view>投诉日期:</view>
+						<view>{{item.tou_su_ri_qi_}} </view>
+					</view>
+					<view style=" width: 100%; text-align: right; padding-top: 5rpx;padding-bottom: 0rpx;"
+						v-if="item.chu_li_jie_guo_sh == '已通知' && item.shi_fou_guo_shen_ == '已反馈'">
+						<u-button type="warning" size="mini" @click="getGo(item.id_)">签名</u-button>
+					</view>
+				</uni-section>
+			</view>
+		</block>
+
+		<view style="position: fixed;right: 30rpx;bottom: 100rpx;">
+			<image src="../../../static/add.png" style="width: 150rpx;height: 150rpx;" @click="getGo('')"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		ACCESS_TOKEN,
+		USER_NAME,
+		USER_INFO
+	} from "@/common/util/constants" // 拉取登录token,userName,userInfo
+	export default {
+		data() {
+			return {
+				list: [],
+				current: 0,
+				ReachBottomShow: false
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.current = 0
+			this.list = []
+			this.getData()
+		},
+		// 上拉加载
+		onReachBottom() {
+			let _self = this
+			uni.showNavigationBarLoading()
+			if (this.ReachBottomShow) {
+				this.getData()
+			}
+
+		},
+		created() {
+			this.getData()
+		},
+		methods: {
+			// 拉取列表数据
+			getData() {
+				uni.showLoading({
+					mask: true,
+					title: 'loading'
+				});
+
+				let info = uni.getStorageSync(USER_INFO);
+				let useId = info.user.id
+
+				var page = 0
+				if (this.current == 0) {
+					page = 0
+				} else {
+					page = this.current * 10
+				}
+
+				let sql =
+					`select a.*,b.name_ from t_complaint a left join ibps_party_employee b on a.complainants_ = b.id_ where a.complainants_ = '${useId}' ORDER BY a.id_ desc LIMIT ${page},10`
+
+				let requestData = this.$sig(sql)
+				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
+					if (res.data.state == 200) {
+						const data = res.data.variables.data
+						this.list.push(...data)
+						uni.stopPullDownRefresh();
+						if (data.length > 10) {
+							this.ReachBottomShow = false
+						} else {
+							this.current++
+						}
+						uni.hideLoading()
+					}
+				})
+			},
+			getGo(id) {
+				uni.navigateTo({ // 跳转页面
+					url: '/pages/jiance/tousu?id=' + id
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>

+ 1 - 1
pages/jiance/weituo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">检测申请</block>
 		</cu-custom>

+ 14 - 8
pages/login/login.vue

@@ -2,10 +2,12 @@
 	<view class="zai-box">
 		<scroll-view scroll-y class="page">
 			<view class="flex-center-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]">
-				<!-- <image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode='aspectFit' class="zai-logo "></image> -->
-				<image src="../login/MJ_logo.jpg" mode='aspectFit' class="zai-logo "
-					style="position: relative;top: 12rpx;margin-right: 5rpx;"></image>
-				<view class="zai-title text-shadow ">明鉴细胞检测服务平台 </view>
+				<image src="../login/luohuLogo.png" mode='aspectFit' class="zai-logo "
+					style="position: relative;top: 16rpx;margin-right: 5rpx;"></image>
+				<view class="zai-title text-shadow logonTitle" style="font-size: 45rpx">深圳市罗湖医院集团</view>
+			</view>
+			<view class="flex-center-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]">
+				<view class="zai-title text-shadow logonTitle">细胞质量检测服务平台</view>
 			</view>
 			<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
 				<block v-if="loginWay==1">
@@ -35,7 +37,7 @@
 
 
 					<view class="m-t-100">
-						<u-button type="primary" :loading="loading" @tap="onLogin" iconColor="rgb(180,35,41)">
+						<u-button type="primary" :loading="loading" @tap="onLogin" iconColor="#3396d1">
 							{{loading ? "登录中...":" 登录 "}}
 						</u-button>
 
@@ -247,7 +249,7 @@
 						if (res.data.state == 200) {
 							this.image = res.data.data;
 							this.iscaptcha = true
-						}else if(res.data.state == 501){
+						} else if (res.data.state == 501) {
 							this.iscaptcha = false
 						}
 					})
@@ -394,7 +396,7 @@
 	}
 
 	.zai-title {
-		font-size: 58upx;
+		font-size: 58rpx;
 		color: #000000;
 		/* text-align: center; */
 	}
@@ -445,7 +447,11 @@
 		margin-right: 10rpx;
 	}
 
+	.logonTitle {
+		color: #01a39e;
+	}
+
 	/deep/ .u-btn--primary {
-		background-color: rgb(180, 35, 41);
+		background-color: #3396d1;
 	}
 </style>

BIN
pages/login/luohuLogo.png


+ 1 - 1
pages/specimen/specimen.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">样品查询</block>
 		</cu-custom>

+ 2 - 2
pages/tag/sampleTag.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="bg">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backview">返回</block>
 			<block slot="content">样品标签</block>
 		</cu-custom>
@@ -97,7 +97,7 @@
 			},
 			getLook(id) {
 				let sql =
-					`select * from t_lhypb where parent_id_ = '${id}'`
+					`select * from t_lhypb where parent_id_ = '${id}' order by yang_pin_bian_hao asc`
 				let requestData = this.$sig(sql)
 
 

+ 85 - 80
pages/user/editpassword.vue

@@ -1,46 +1,50 @@
 <template>
 	<view>
 		<scroll-view scroll-y class="page">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="true" >
+			<cu-custom bgColor="bg-luohu" :isBack="true">
 				<block slot="backText">返回</block>
 				<block slot="content">修改密码</block>
 				<!-- <view slot="right"  @tap="rightClick">编辑</view> -->
 			</cu-custom>
-			
-						<view class="example-body " style="display: flex;justify-content: center; margin-top: 80rpx;">
-							<uni-file-picker readonly :value="fileLists" :imageStyles="imageStyles" file-mediatype="image">
-							</uni-file-picker>
-	
-						</view>
-			
-			
+
+			<view class="example-body " style="display: flex;justify-content: center; margin-top: 80rpx;">
+				<uni-file-picker readonly :value="fileLists" :imageStyles="imageStyles" file-mediatype="image">
+				</uni-file-picker>
+
+			</view>
+
+
 			<!-- list列表 -->
 			<uni-card>
-			<view class="cu-list menu">
+				<view class="cu-list menu">
 
-				<view class="cu-form-group">
+					<view class="cu-form-group">
 						<view class="title">密码</view>
-						<input placeholder="请输入六位以上密码" name="input" type="password" v-model="password"  ></input>
-				</view>
-				<view class="cu-form-group">
+						<input placeholder="请输入六位以上密码" name="input" type="password" v-model="password"></input>
+					</view>
+					<view class="cu-form-group">
 						<view class="title">确认</view>
-						<input placeholder="请再输入一遍密码" name="input" type="password" v-model="again" ></input>
+						<input placeholder="请再输入一遍密码" name="input" type="password" v-model="again"></input>
+					</view>
+
+
 				</view>
-				
 
-		</view>
-			
 			</uni-card>
-					<view class="padding flex flex-direction" style="margin-bottom: 100rpx;">
-						<button class="cu-btn bg-blue lg" @click="submit">确认修改</button>
-					</view>
+			<view class="padding flex flex-direction" style="margin-bottom: 100rpx;">
+				<button class="cu-btn bg-blue lg" @click="submit">确认修改</button>
+			</view>
 
 		</scroll-view>
 	</view>
 </template>
 
 <script>
-	import { ACCESS_TOKEN,USER_NAME,USER_INFO } from "@/common/util/constants"
+	import {
+		ACCESS_TOKEN,
+		USER_NAME,
+		USER_INFO
+	} from "@/common/util/constants"
 	import api from '@/api/api.js'
 	export default {
 		data() {
@@ -67,59 +71,59 @@
 				},
 				fileLists: [{
 					//url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b7c7f970-517d-11eb-97b7-0dc4655d6e68.jpg',
-					url:'/static/touxiang.jpg',
+					url: '/static/touxiang.jpg',
 					extname: 'png',
 					name: 'shuijiao.png'
 				}],
-				password:"",
-				again:"",
+				password: "",
+				again: "",
 
 
 			};
 		},
 		onLoad() {
-			this.user=uni.getStorageSync(USER_INFO);
+			this.user = uni.getStorageSync(USER_INFO);
 			//this.loadinfo()
 			console.log(this.user)
-			
+
 		},
 		methods: {
-           submit(){
-			  if(!this.password || this.password.length<6){
-			  				this.$tip.alert('正确输入密码');
-			  		return false
-			  }
-			   if(this.password != this.again){
-			   				this.$tip.alert('两次输入不一致');
-			   	return false
-			   }
-				
-				let data={
-				  "userIds": [
-					this.user.employee.id,
-				  ],
-				  "newPassword": this.password,
-				  "repeatPassword": this.again,
-				  "primitivePassword": "",
-				  "reset": 1
+			submit() {
+				if (!this.password || this.password.length < 6) {
+					this.$tip.alert('正确输入密码');
+					return false
+				}
+				if (this.password != this.again) {
+					this.$tip.alert('两次输入不一致');
+					return false
+				}
+
+				let data = {
+					"userIds": [
+						this.user.employee.id,
+					],
+					"newPassword": this.password,
+					"repeatPassword": this.again,
+					"primitivePassword": "",
+					"reset": 1
 				};
-			let that=this;
-			this.$http.post("/ibps/platform/v3/user/change/passwd",data).then(res=>{
-			  if(res.data.state==200){
-				that.$tip.toast("修改成功") 
- 				  uni.navigateTo({
-					url:"/pages/index/index"
-				}) 
-
-			  }else{
-
-				this.$tip.toast("发送异常");
-			  }
-			});	
-				
-				
-				
-		   }
+				let that = this;
+				this.$http.post("/ibps/platform/v3/user/change/passwd", data).then(res => {
+					if (res.data.state == 200) {
+						that.$tip.toast("修改成功")
+						uni.navigateTo({
+							url: "/pages/index/index"
+						})
+
+					} else {
+
+						this.$tip.toast("发送异常");
+					}
+				});
+
+
+
+			}
 		}
 	}
 </script>
@@ -149,22 +153,23 @@
 	.switch-music::before {
 		content: "\e6db";
 	}
-		.example-body {
-			padding: 10px;
-			padding-top: 0;
-		}
-	
-		.custom-image-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-		}
-	
-		.text {
-			font-size: 14px;
-			color: #333;
-		}
+
+	.example-body {
+		padding: 10px;
+		padding-top: 0;
+	}
+
+	.custom-image-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.text {
+		font-size: 14px;
+		color: #333;
+	}
 </style>

+ 15 - 5
pages/user/people.vue

@@ -6,7 +6,7 @@
 				<uni-file-picker readonly :value="fileLists" :imageStyles="imageStyles" file-mediatype="image">
 				</uni-file-picker>
 
-<!-- 								<image :src="personalList.avatar" class="png round animation-slide-right margin-bottom-sm"
+				<!-- 								<image :src="personalList.avatar" class="png round animation-slide-right margin-bottom-sm"
 					mode="scaleToFill" :style="[{animationDelay: '0.1s'}]"></image> -->
 				<image src="https://static.jeecg.com/upload/test/wave_1595818053612.gif" mode="scaleToFill"
 					class="gif-wave"></image>
@@ -14,12 +14,12 @@
 			<view class="padding flex text-center text-grey bg-white shadow-warp">
 				<view class="flex flex-sub flex-direction solid-right animation-slide-top"
 					:style="[{animationDelay: '0.2s'}]">
-					<view class="text-xl text-orange">{{personalList.username}}</view>
+					<view class="text-xl text-orange title-message">{{personalList.username}}</view>
 					<view class="margin-top-sm"><text class="cuIcon-people"></text> 用户</view>
 				</view>
 
 				<view class="flex flex-sub flex-direction animation-slide-top" :style="[{animationDelay: '0.2s'}]">
-					<view class="text-xl text-green">{{personalList.post?personalList.post:'员工'}}</view>
+					<view class="text-xl text-green title-message">{{personalList.post?personalList.post:'客户'}}</view>
 					<view class="margin-top-sm"><text class="cuIcon-news"></text> 职务</view>
 				</view>
 			</view>
@@ -27,13 +27,13 @@
 			<view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius">
 
 
-
+				<!-- 
 				<view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
 					<view class="content">
 						<text class="cuIcon-redpacket_fill text-red"></text>
 						<text class="text-grey">红包</text>
 					</view>
-				</view>
+				</view> -->
 
 				<!--
 			<view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.3s'}]" @tap="scan">
@@ -259,3 +259,13 @@
 		height: 300rpx;
 	}
 </style>
+
+<style scoped>
+	.title-message {
+		display: inline-block;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		width: 340rpx;
+	}
+</style>

+ 153 - 137
pages/user/userdetail.vue

@@ -1,23 +1,23 @@
 <template>
 	<view>
 		<scroll-view scroll-y class="page">
-			<cu-custom bgColor="bg-gradual-pink" :isBack="true" >
+			<cu-custom bgColor="bg-luohu" :isBack="true">
 				<block slot="backText">返回</block>
 				<block slot="content">用户详情</block>
 				<!-- <view slot="right"  @tap="rightClick">编辑</view> -->
 			</cu-custom>
-			
-						<view class="example-body " style="display: flex;justify-content: center; margin-top: 80rpx;">
-							<uni-file-picker readonly :value="fileLists" :imageStyles="imageStyles" file-mediatype="image">
-							</uni-file-picker>
-	
-						</view>
-			
-			
+
+			<view class="example-body " style="display: flex;justify-content: center; margin-top: 80rpx;">
+				<uni-file-picker readonly :value="fileLists" :imageStyles="imageStyles" file-mediatype="image">
+				</uni-file-picker>
+
+			</view>
+
+
 			<!-- list列表 -->
 			<uni-card>
-			<view class="cu-list menu">
-<!-- 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.1s'}]">
+				<view class="cu-list menu">
+					<!-- 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.1s'}]">
 					<view class="content">
 						<text class="text-grey">头像</text>
 					</view>
@@ -26,48 +26,48 @@
 					</view>
 				
 				</view> -->
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
-					<view class="content">
-						<text class="text-grey">姓名:</text>
-					</view>
-					<view class="action">
-						<text class="text-grey">{{user.name}}</text>
-					</view>
-				</view>
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
-					<view class="content">
-						<text class="text-grey">单位名称:</text>
-					</view>
-					<view class="action">
-						<text class="text-grey">{{user.orgName}}</text>
-					</view>
-				</view>
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
-					<view class="content">
-						<text class="text-grey">手机号:</text>
-					</view>
-					<view class="action">
-						<text class="text-grey">{{user.mobile}}</text>
+					<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
+						<view class="content">
+							<text class="text-grey">姓名:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey">{{user.name}}</text>
+						</view>
 					</view>
-				</view>
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
-					<view class="content">
-						<text class="text-grey">邮箱:</text>
+					<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
+						<view class="content">
+							<text class="text-grey">单位名称:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey">{{user.orgName}}</text>
+						</view>
 					</view>
-					<view class="action">
-						<text class="text-grey">{{user.email}}</text>
+					<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
+						<view class="content">
+							<text class="text-grey">手机号:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey">{{user.mobile}}</text>
+						</view>
 					</view>
-				</view>
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
-					<view class="content">
-						<text class="text-grey">地址:</text>
+					<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
+						<view class="content">
+							<text class="text-grey">邮箱:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey">{{user.email}}</text>
+						</view>
 					</view>
-					<view class="action">
-						<text class="text-grey">{{user.address}}</text>
+					<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
+						<view class="content">
+							<text class="text-grey">地址:</text>
+						</view>
+						<view class="action">
+							<text class="text-grey">{{user.address}}</text>
+						</view>
 					</view>
-				</view>
 
-<!-- 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.3s'}]">
+					<!-- 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.3s'}]">
 					<view class="content">
 						<text class="text-grey">性别</text>
 					</view>
@@ -75,7 +75,7 @@
 						<text class="text-grey">{{personalMsg.sex}}</text>
 					</view>
 				</view> -->
-<!-- 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.4s'}]">
+					<!-- 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.4s'}]">
 					<view class="content">
 						<text class="text-grey">生日</text>
 					</view>
@@ -83,9 +83,9 @@
 						<text class="text-grey">{{personalMsg.birthday}}</text>
 					</view>
 				</view> -->
-			</view>
-			
-<!-- 			<view class="cu-list menu">
+				</view>
+
+				<!-- 			<view class="cu-list menu">
 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.5s'}]">
 					<view class="content">
 						<text class="text-grey">对外信息展示</text>
@@ -95,10 +95,10 @@
 					</view>
 				</view>
 			</view> -->
-			
-			
-			
-<!-- 			<view class="cu-list menu">
+
+
+
+				<!-- 			<view class="cu-list menu">
 				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.9s'}]">
 					<view class="content">
 						<text class="text-grey">手机</text>
@@ -117,19 +117,23 @@
 				</view>
 			</view> -->
 			</uni-card>
-	
+
 
 		</scroll-view>
 	</view>
 </template>
 
 <script>
-	import { ACCESS_TOKEN,USER_NAME,USER_INFO } from "@/common/util/constants"
+	import {
+		ACCESS_TOKEN,
+		USER_NAME,
+		USER_INFO
+	} from "@/common/util/constants"
 	import api from '@/api/api.js'
 	export default {
 		data() {
 			return {
-				userInfo:{},
+				userInfo: {},
 				imageStyles: {
 					width: 84,
 					height: 84,
@@ -152,105 +156,116 @@
 				},
 				fileLists: [{
 					//url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b7c7f970-517d-11eb-97b7-0dc4655d6e68.jpg',
-					url:'/static/touxiang.jpg',
+					url: '/static/touxiang.jpg',
 					extname: 'png',
 					name: 'shuijiao.png'
 				}],
-				user:{
-				companyname:'',
-			    number:'',
-				username:'',
+				user: {
+					companyname: '',
+					number: '',
+					username: '',
 				},
-				 personalMsg:{
-					avatar:'',
-					realname:'',
-					username:'',
-					sex:1,
-					birthday:new Date(),
-					orgCode:'',
-					workNo:'',
-					status:1,
-					phone:'',
-					telephone:'',
-					email:'',
-					post:'',
-					departIds:'',
-					identity:'',
+				personalMsg: {
+					avatar: '',
+					realname: '',
+					username: '',
+					sex: 1,
+					birthday: new Date(),
+					orgCode: '',
+					workNo: '',
+					status: 1,
+					phone: '',
+					telephone: '',
+					email: '',
+					post: '',
+					departIds: '',
+					identity: '',
 				},
-				userUrl:'/sys/user/queryById',
-				positionUrl:'/sys/position/list',
-				departUrl:'/sys/user/userDepartList'
+				userUrl: '/sys/user/queryById',
+				positionUrl: '/sys/position/list',
+				departUrl: '/sys/user/userDepartList'
 			};
 		},
 		onLoad() {
-			this.user=uni.getStorageSync(USER_INFO).employee;
+			this.user = uni.getStorageSync(USER_INFO).employee;
 			console.log(this.user)
-			
+
 		},
 		methods: {
-			getSubStringText(text,len){
-				if(!text || text.length==0){
+			getSubStringText(text, len) {
+				if (!text || text.length == 0) {
 					return ''
 				}
-				if(text.length<len){
+				if (text.length < len) {
 					return text;
 				}
-				return text.substr(0,len)+"..."
+				return text.substr(0, len) + "..."
 			},
-			rightClick(){
-				this.$Router.push({name:'useredit', params:this.personalMsg})
+			rightClick() {
+				this.$Router.push({
+					name: 'useredit',
+					params: this.personalMsg
+				})
 				/* uni.navigateTo({
 				    url: '/pages/user/useredit?item='+item
 				}); */
 			},
-			loadinfo(){
-				this.$http.get(this.userUrl,{params:{id:this.$store.getters.userid}}).then(res=> {
-					console.log("用户",res)
+			loadinfo() {
+				this.$http.get(this.userUrl, {
+					params: {
+						id: this.$store.getters.userid
+					}
+				}).then(res => {
+					console.log("用户", res)
 					if (res.data.success) {
 						let result = res.data.result
-						if(result.avatar&&result.avatar.length >0)
-						this.personalMsg.avatar = api.getFileAccessHttpUrl(result.avatar)
+						if (result.avatar && result.avatar.length > 0)
+							this.personalMsg.avatar = api.getFileAccessHttpUrl(result.avatar)
 						this.personalMsg.realname = result.realname
-						this.personalMsg.username= result.username
+						this.personalMsg.username = result.username
 						this.personalMsg.post = result.post
-						this.personalMsg.sex = result.sex===1?'男':'女'
-						this.personalMsg.birthday = result.birthday== null?'无':result.birthday
-						this.personalMsg.departIds= result.departIds
-						this.personalMsg.workNo= result.workNo
-						this.personalMsg.phone= result.phone
-						this.personalMsg.telephone= result.telephone== null?'无':result.telephone
-						this.personalMsg.email= result.email
-						this.personalMsg.post= result.post
-						this.personalMsg.identity= result.identity=== 1?'普通成员':'上级'
-						this.personalMsg.status= result.status === 1?'正常':'冻结'
-						this.personalMsg.orgCode= result.orgCode
+						this.personalMsg.sex = result.sex === 1 ? '男' : '女'
+						this.personalMsg.birthday = result.birthday == null ? '无' : result.birthday
+						this.personalMsg.departIds = result.departIds
+						this.personalMsg.workNo = result.workNo
+						this.personalMsg.phone = result.phone
+						this.personalMsg.telephone = result.telephone == null ? '无' : result.telephone
+						this.personalMsg.email = result.email
+						this.personalMsg.post = result.post
+						this.personalMsg.identity = result.identity === 1 ? '普通成员' : '上级'
+						this.personalMsg.status = result.status === 1 ? '正常' : '冻结'
+						this.personalMsg.orgCode = result.orgCode
 					}
-				}).catch(e=>{
-					console.log("请求错误",e)
+				}).catch(e => {
+					console.log("请求错误", e)
 				})
-				
-				this.$http.get(this.departUrl,{params:{userId:this.$store.getters.userid}}).then(res=> {
+
+				this.$http.get(this.departUrl, {
+					params: {
+						userId: this.$store.getters.userid
+					}
+				}).then(res => {
 					if (res.success) {
-						for (let item of res.result){
+						for (let item of res.result) {
 							this.personalMsg.orgCode = item.title
 							this.personalMsg.departIds = item.title
 						}
 					}
-				}).catch(e=>{
-					console.log("请求错误",e)
+				}).catch(e => {
+					console.log("请求错误", e)
 				})
-				
-				this.$http.get(this.positionUrl).then(res=> {
+
+				this.$http.get(this.positionUrl).then(res => {
 					if (res.success) {
 						let postArr = res.result.records
-						for (let item of postArr ){
-							if (this.personalMsg.post == item.code){
+						for (let item of postArr) {
+							if (this.personalMsg.post == item.code) {
 								this.personalMsg.post = item.name
 							}
 						}
 					}
-				}).catch(e=>{
-					console.log("请求错误",e)
+				}).catch(e => {
+					console.log("请求错误", e)
 				})
 			},
 		}
@@ -282,22 +297,23 @@
 	.switch-music::before {
 		content: "\e6db";
 	}
-		.example-body {
-			padding: 10px;
-			padding-top: 0;
-		}
-	
-		.custom-image-box {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-		}
-	
-		.text {
-			font-size: 14px;
-			color: #333;
-		}
+
+	.example-body {
+		padding: 10px;
+		padding-top: 0;
+	}
+
+	.custom-image-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.text {
+		font-size: 14px;
+		color: #333;
+	}
 </style>

+ 82 - 78
pages/user/useredit.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
+		<cu-custom bgColor="bg-luohu" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">编辑资料</block>
 		</cu-custom>
@@ -16,8 +16,9 @@
 			<view class="cu-form-group">
 				<view class="title">头像</view>
 				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
-					 <image :src="imgList[index]" mode="aspectFill"></image>
+					<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
+						:data-url="imgList[index]">
+						<image :src="imgList[index]" mode="aspectFill"></image>
 						<view class="cu-tag bg-red radius" @tap.stop="DelImg" :data-index="index">
 							<text class='cuIcon-close'></text>
 						</view>
@@ -27,14 +28,15 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="cu-form-group margin-top">
 				<view class="title">性别</view>
-				<switch class='switch-sex' @change="SwitchC" :class="switchC?'checked':''" :checked="switchC?true:false"></switch>
+				<switch class='switch-sex' @change="SwitchC" :class="switchC?'checked':''"
+					:checked="switchC?true:false"></switch>
 			</view>
-			
-			
-			
+
+
+
 			<view class="cu-form-group margin-top">
 				<view class="title">手机号码</view>
 				<input placeholder="输入手机号码" name="input" v-model="myFormData.phone"></input>
@@ -49,10 +51,10 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="title">邮箱</view>
-				<input placeholder="输入邮箱" name="input"  v-model="myFormData.email"></input>
+				<input placeholder="输入邮箱" name="input" v-model="myFormData.email"></input>
 			</view>
 			<view class="padding flex flex-direction">
-				<button class="cu-btn bg-blue lg"  @click="onSubmit">提交</button>
+				<button class="cu-btn bg-blue lg" @click="onSubmit">提交</button>
 			</view>
 		</form>
 	</view>
@@ -65,94 +67,96 @@
 				index: -1,
 				switchC: true,
 				imgList: [],
-				uploadUrl:"/sys/common/upload",
-				myFormData:{
-					avatar:'',
-					realname:'',
-					username:'',
-					sex:1,
-					birthday:'',
-					orgCode:'',
-					workNo:'',
-					phone:'',
-					email:'',
-					id:'',
+				uploadUrl: "/sys/common/upload",
+				myFormData: {
+					avatar: '',
+					realname: '',
+					username: '',
+					sex: 1,
+					birthday: '',
+					orgCode: '',
+					workNo: '',
+					phone: '',
+					email: '',
+					id: '',
 				},
 			};
 		},
-		onLoad: function (option) {
-			console.log("this.$Route.query",this.$Route.query);
-			let query=this.$Route.query
-			if(query){
-				this.myFormData=query;
-				if(this.myFormData.sex=='女'){
-				  this.switchC = false
-				}else if(this.myFormData.sex=='男'){
-				  this.switchC = true
+		onLoad: function(option) {
+			console.log("this.$Route.query", this.$Route.query);
+			let query = this.$Route.query
+			if (query) {
+				this.myFormData = query;
+				if (this.myFormData.sex == '女') {
+					this.switchC = false
+				} else if (this.myFormData.sex == '男') {
+				 this.switchC = true
 				}
-				if(this.myFormData.avatar){
-				  this.imgList=[this.myFormData.avatar]
+				if (this.myFormData.avatar) {
+					this.imgList = [this.myFormData.avatar]
 				}
-				if(!this.myFormData.birthday){
-				  this.myFormData.birthday= '无'
+				if (!this.myFormData.birthday) {
+					this.myFormData.birthday = '无'
 				}
-				if(this.myFormData.identity=='普通成员'){
-				  this.myFormData.identity = 1
-				}else if(this.myFormData.identity=='上级'){
-				  this.myFormData.identity = 2
+				if (this.myFormData.identity == '普通成员') {
+					this.myFormData.identity = 1
+				} else if (this.myFormData.identity == '上级') {
+					this.myFormData.identity = 2
 				}
-				if(this.myFormData.status=='正常'){
-				  this.myFormData.status = 1
-				}else if(this.myFormData.status=='冻结'){
-				  this.myFormData.status = 2
+				if (this.myFormData.status == '正常') {
+					this.myFormData.status = 1
+				} else if (this.myFormData.status == '冻结') {
+					this.myFormData.status = 2
 				}
-				 this.Avatar=this.myFormData.avatar
-	
-				Object.keys(this.myFormData).map(key=>{
-				  if(this.myFormData[key]=='无'){
-					this.myFormData[key] = ''
-				  }
+				this.Avatar = this.myFormData.avatar
+
+				Object.keys(this.myFormData).map(key => {
+					if (this.myFormData[key] == '无') {
+						this.myFormData[key] = ''
+					}
 				})
-				console.log("this.myFormData",this.myFormData)
+				console.log("this.myFormData", this.myFormData)
 			}
 		},
 		methods: {
 			onSubmit() {
-			  let myForm = this.myFormData
-			  let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
-			  let checkEmail = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
-			  console.log("myForm",myForm)
-			  if(!myForm.phone || myForm.phone.length==0){
-				this.$tip.alert('请输入手机号');
-				return false
-			  }
-			  if(!checkPhone.test(myForm.phone)){
-				this.$tip.alert('请输入正确的手机号');
-				return false
-			  }
-			  if(!checkEmail.test(myForm.email)){
-				this.$tip.alert('请输入正确的邮箱地址');
-				return false
-			  }
+				let myForm = this.myFormData
+				let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
+				let checkEmail = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+				console.log("myForm", myForm)
+				if (!myForm.phone || myForm.phone.length == 0) {
+					this.$tip.alert('请输入手机号');
+					return false
+				}
+				if (!checkPhone.test(myForm.phone)) {
+					this.$tip.alert('请输入正确的手机号');
+					return false
+				}
+				if (!checkEmail.test(myForm.email)) {
+					this.$tip.alert('请输入正确的邮箱地址');
+					return false
+				}
 				this.myFormData.id = this.$store.getters.userid
-				if(this.switchC){
-					this.myFormData.sex=1
-				}else{
-					this.myFormData.sex=2
+				if (this.switchC) {
+					this.myFormData.sex = 1
+				} else {
+					this.myFormData.sex = 2
 				}
-				console.log('myform',this.myFormData)
+				console.log('myform', this.myFormData)
 				this.$tip.loading();
-				this.$http.put('/sys/user/appEdit',this.myFormData).then(res=>{
+				this.$http.put('/sys/user/appEdit', this.myFormData).then(res => {
 					console.log(res)
 					this.$tip.loaded();
-					if (res.data.success){
+					if (res.data.success) {
 						this.$tip.toast('提交成功')
-						this.$Router.replace({name:'userdetail'})
+						this.$Router.replace({
+							name: 'userdetail'
+						})
 						/* uni.navigateTo({
 							url: '/pages/user/userdetail'
 						}) */
 					}
-				}).catch(()=>{
+				}).catch(() => {
 					this.$tip.loaded();
 					this.$tip.error('提交失败')
 				});
@@ -164,18 +168,18 @@
 				this.switchC = e.detail.value
 			},
 			ChooseImage() {
-				var that=this;
+				var that = this;
 				uni.chooseImage({
 					count: 4, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
 					sourceType: ['album'], //从相册选择
 					success: (res) => {
-						that.$http.upload(that.$config.apiUrl+that.uploadUrl, {
+						that.$http.upload(that.$config.apiUrl + that.uploadUrl, {
 								filePath: res.tempFilePaths[0],
 								name: 'file'
 							})
 							.then(res => {
-								that.myFormData.avatar=res.data.message;
+								that.myFormData.avatar = res.data.message;
 							})
 							.catch(err => {
 								that.$tip.error(err.data.message)

BIN
static/add.png


BIN
static/luohuLogo.png


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.