zhaogongxue пре 1 година
родитељ
комит
8eb8f26ddc
100 измењених фајлова са 720 додато и 707 уклоњено
  1. 15 11
      App.vue
  2. 38 15
      components/hx-invite/hx-invite.vue
  3. 37 11
      components/hx-order/hx-order.vue
  4. 1 1
      pages/login/login.vue
  5. 8 9
      pages/luntan/luntan.vue
  6. 89 25
      pages/xiaoxi/xiaoxi.vue
  7. 18 8
      pagesA/Project .vue
  8. 3 2
      pagesA/expectation.vue
  9. 47 16
      pagesA/index-search.vue
  10. 10 3
      pagesA/jianli.vue
  11. 55 37
      pagesA/tel-login.vue
  12. 44 7
      pagesA/work.vue
  13. 3 2
      pagesA/worktion.vue
  14. 7 0
      pagesC/changyong-list.vue
  15. 15 4
      pagesC/chat.vue
  16. 4 2
      pagesC/xiaoxi-list.vue
  17. 2 2
      pagesD/advantage.vue
  18. 13 9
      pagesD/apply.vue
  19. 31 27
      pagesD/apply1.vue
  20. 15 11
      pagesD/change-name.vue
  21. 1 1
      pagesD/my-order.vue
  22. 38 108
      pagesD/order-info.vue
  23. 84 6
      pagesD/pay.vue
  24. 53 25
      pagesD/personal-infor.vue
  25. 1 1
      pagesD/preview.vue
  26. 51 12
      pagesD/resume.vue
  27. 6 3
      pagesD/shezhi.vue
  28. BIN
      pagesD/static/images/wxpay.png
  29. 5 4
      pagesD/upload.vue
  30. 24 29
      pagesD/userinfo.vue
  31. 2 1
      pagesD/work.vue
  32. 0 4
      unpackage/dist/build/mp-weixin/app.js
  33. 0 148
      unpackage/dist/build/mp-weixin/app.json
  34. 0 3
      unpackage/dist/build/mp-weixin/app.wxss
  35. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  36. 0 0
      unpackage/dist/build/mp-weixin/common/main.wxss
  37. 0 2
      unpackage/dist/build/mp-weixin/common/runtime.js
  38. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  39. 0 0
      unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.js
  40. 0 7
      unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.json
  41. 0 0
      unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.wxml
  42. 0 0
      unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.wxss
  43. 0 0
      unpackage/dist/build/mp-weixin/components/hx-order/hx-order.js
  44. 0 7
      unpackage/dist/build/mp-weixin/components/hx-order/hx-order.json
  45. 0 0
      unpackage/dist/build/mp-weixin/components/hx-order/hx-order.wxml
  46. 0 0
      unpackage/dist/build/mp-weixin/components/hx-order/hx-order.wxss
  47. 0 10
      unpackage/dist/build/mp-weixin/components/hx-school/hx-school.js
  48. 0 4
      unpackage/dist/build/mp-weixin/components/hx-school/hx-school.json
  49. 0 1
      unpackage/dist/build/mp-weixin/components/hx-school/hx-school.wxml
  50. 0 1
      unpackage/dist/build/mp-weixin/components/hx-school/hx-school.wxss
  51. 0 0
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.js
  52. 0 6
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.json
  53. 0 1
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.wxml
  54. 0 1
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.wxss
  55. 0 0
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas.js
  56. 0 4
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas.json
  57. 0 1
      unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas.wxml
  58. 0 0
      unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.js
  59. 0 4
      unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.json
  60. 0 0
      unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.wxml
  61. 0 0
      unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.wxss
  62. 0 0
      unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.js
  63. 0 9
      unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.json
  64. 0 0
      unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.wxml
  65. 0 0
      unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.wxss
  66. 0 10
      unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.js
  67. 0 4
      unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.json
  68. 0 1
      unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.wxml
  69. 0 1
      unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.wxss
  70. 0 10
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js
  71. 0 6
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--input/u--input.json
  72. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--input/u--input.wxml
  73. 0 10
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js
  74. 0 6
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--text/u--text.json
  75. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--text/u--text.wxml
  76. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js
  77. 0 4
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.json
  78. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.wxml
  79. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.wxss
  80. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js
  81. 0 7
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.json
  82. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxml
  83. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxss
  84. 0 10
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  85. 0 4
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json
  86. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.wxml
  87. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.wxss
  88. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.js
  89. 0 6
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json
  90. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.wxml
  91. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.wxss
  92. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.js
  93. 0 4
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.json
  94. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.wxml
  95. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.wxss
  96. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js
  97. 0 6
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.json
  98. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml
  99. 0 1
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss
  100. 0 0
      unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js

+ 15 - 11
App.vue

@@ -1,6 +1,10 @@
 <script>
-	import {conn} from './utils/WebIM';
-	import {index} from "@/units/inquire.js"
+	import {
+		conn
+	} from './utils/WebIM';
+	import {
+		index
+	} from "@/units/inquire.js"
 	export default {
 		onLaunch: function() {
 			setTimeout(() => {
@@ -24,11 +28,11 @@
 						})
 					} */
 				} else {
-					// if (getCurrentPages()[0].route != 'pages/login/login') {
-					// 	uni.reLaunch({
-					// 		url: "/pages/login/login"
-					// 	})
-					// }
+					if (getCurrentPages()[0].route != 'pages/login/login') {
+						uni.reLaunch({
+							url: "/pages/login/login"
+						})
+					}
 				}
 			}, 800)
 		},
@@ -40,7 +44,7 @@
 		},
 		methods: {
 			HXlogin() {
-				if(uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
+				if (uni.getStorageSync('user_no') && uni.getStorageSync('pwd')) {
 					var user_no = uni.getStorageSync('user_no')
 					var pwd = uni.getStorageSync('pwd')
 					conn.open({
@@ -50,11 +54,11 @@
 					}).then(() => {
 						console.log('res');
 					}).catch(reason => {
-						console.log('失败',reason);
+						console.log('失败', reason);
 					})
-					
+
 				}
- 			}
+			}
 		}
 	}
 </script>

+ 38 - 15
components/hx-invite/hx-invite.vue

@@ -14,7 +14,8 @@
 						</view>
 						<view class="u-flex u-row-between dan" style="margin-top: 18rpx;">
 							<view class="u-flex">
-								<u-checkbox :name="index" :disabled="item.is_confirm==0?true : false">
+								<u-checkbox :name="index"
+									:disabled="['unapplied','failed'].includes(item.withdraw_status)&&item.is_confirm==0?true : false">
 								</u-checkbox>
 								<view class="lietou">{{item.type_name}}</view>
 							</view>
@@ -107,16 +108,26 @@
 					{
 						name: "提现记录"
 					}
-				]
+				],
+				list5: [],
+				list6: [],
+				page: 1,
+				total: 0,
 			}
 		},
 		created() {
 			this.commission_list()
 		},
+		onReachBottom() {
+			if (this.total != this.list.length) {
+				this.page++
+				this.commission_list()
+			}
+		},
 		computed: {
 			alla() {
 				var arr = 0
-				if (this.arralylist.length == this.allist.length) {
+				if (this.arralylist.length == this.list5.length) {
 					this.checkboxValue1 = [-2]
 				} else {
 					this.checkboxValue1 = []
@@ -149,31 +160,32 @@
 			},
 			ally() {
 				this.list.forEach((item, index) => {
-
 					this.allist.push(index)
-
 				})
 			},
 			arraly(n) {
-				console.log(n);
 				if (n.length > 0) {
+					this.arralylist = []
 					this.list.forEach((item, index) => {
 						if (item.is_confirm == 1) {
-							this.checkboxValue1.push(index)
+							this.arralylist.push(index)
 						}
 					})
-					this.arralylist = this.checkboxValue1
-					console.log(this.arralylist);
+					// this.arralylist = this.checkboxValue1
 				}
 				if (n.length == 0) {
 					this.arralylist = []
 				}
 			},
 			checkboxChange(n) {
-				console.log(n);
 				this.arralylist = n
-				if (this.arralylist == this.allist) {
-					this.name1 = -2
+				// if (this.arralylist.length == this.list5.length) {
+				// 	this.name1 = -2
+				// }
+				if (this.arralylist.length == this.list5.length) {
+					this.checkboxValue1 = [-2]
+				} else {
+					this.checkboxValue1 = []
 				}
 			},
 			return1() {
@@ -196,16 +208,27 @@
 			},
 			commission_list() {
 				commission_list({
+					page:1,
 					source_type: "invite",
 					job_name: "",
 					is_confirm: "",
 					begin_time: "",
 					end_time: "",
 					time_type: "",
-					status: "unapplied"
+					// status: "unapplied"
 				}).then(res => {
-					this.list = res.data.data
-					this.ally()
+					if (this.page == 1) {
+						this.list = res.data.data
+					} else {
+						this.list = this.list.concat(res.data.data)
+						console.log(this.list);
+					}
+					res.data.data.forEach(item => {
+						if (item.is_confirm == 1) {
+							this.list5.push(item)
+						}
+					})
+					// this.ally()
 				})
 			}
 		},

+ 37 - 11
components/hx-order/hx-order.vue

@@ -4,7 +4,7 @@
 			<view class="yong" v-if="current==0" style="margin-top: 20rpx;" v-for="(item,index) in list" :key="index">
 				<view class="u-flex">
 					<u-checkbox :customStyle="{marginBottom: '8px'}" :name="index"
-						:disabled="item.is_confirm==0?true : false">
+						:disabled="['unapplied','failed'].includes(item.withdraw_status)&&item.is_confirm==0?true : false">
 					</u-checkbox>
 					<view class="" style="flex: 1;">
 						<view class="" style="font-size: 24rpx;
@@ -116,6 +116,7 @@ color: #555555;">
 				all: "",
 				moneylist: [],
 				list: [],
+				list5: [],
 				allist: [],
 				list2: [{
 					label: '订单佣金',
@@ -145,16 +146,24 @@ color: #555555;">
 					{
 						name: "提现记录"
 					}
-				]
+				],
+				page: 1,
+				total: 0
 			}
 		},
 		created() {
 			this.commission_list()
 		},
+		onReachBottom() {
+			if (this.total != this.list.length) {
+				this.page++
+				this.commission_list()
+			}
+		},
 		computed: {
 			alla() {
 				var arr = 0
-				if (this.arralylist.length == this.allist.length) {
+				if (this.arralylist.length == this.list5.length) {
 					this.checkboxValue1 = [-2]
 				} else {
 					this.checkboxValue1 = []
@@ -192,13 +201,14 @@ color: #555555;">
 			},
 			arraly(n) {
 				if (n.length > 0) {
+					this.arralylist = []
 					this.list.forEach((item, index) => {
 						if (item.is_confirm == 1) {
-							this.checkboxValue1.push(index)
+							this.arralylist.push(index)
 						}
 					})
-					this.arralylist = this.checkboxValue1
-					console.log(this.arralylist);
+					// this.arralylist = this.checkboxValue1
+					// console.log(this.arralylist);
 				}
 				if (n.length == 0) {
 					this.arralylist = []
@@ -206,8 +216,13 @@ color: #555555;">
 			},
 			checkboxChange(n) {
 				this.arralylist = n
-				if (this.arralylist == this.allist) {
-					this.name1 = -2
+				// if (this.arralylist == this.allist) {
+				// 	this.name1 = -2
+				// }
+				if (this.arralylist.length == this.list5.length) {
+					this.checkboxValue1 = [-2]
+				} else {
+					this.checkboxValue1 = []
 				}
 			},
 			return1() {
@@ -239,16 +254,27 @@ color: #555555;">
 			},
 			commission_list() {
 				commission_list({
+					page: this.page,
 					source_type: "order",
 					job_name: "",
 					is_confirm: "",
 					begin_time: "",
 					end_time: "",
 					time_type: "",
-					status: "unapplied"
+					// status: "unapplied"
 				}).then(res => {
-					this.list = res.data.data
-					this.ally()
+					if (this.page == 1) {
+						this.list = res.data.data
+					} else {
+						this.list = this.list.concat(res.data.data)
+						console.log(this.list);
+					}
+					this.total = res.data.total
+					res.data.data.forEach(item => {
+						if (item.is_confirm == 1) {
+							this.list5.push(item)
+						}
+					})
 				})
 			}
 		}

+ 1 - 1
pages/login/login.vue

@@ -3,7 +3,7 @@
 		<!-- <u-navbar :is-back="false" :border-bottom="false" :background="{background:'rgba(0,0,0,0)'}"></u-navbar> -->
 		<view class="login-top u-flex-col u-col-center u-row-center">
 			<image src="../../static/images/logo.png" mode=""></image>
-			<text>内核招聘</text>
+			<text>候选人求职</text>
 		</view>
 		<button class="login-btn1" @click="tologin">微信授权登录</button>
 		<view class="login-btn2" @click="totel">

+ 8 - 9
pages/luntan/luntan.vue

@@ -2,8 +2,6 @@
 	<view class="luntan-pages">
 		<view class="luntan-header">
 			<image class="index-bg" src="../../static/images/index-header.png" mode=""></image>
-			<!-- 	<u-navbar :isBack="false" :background="{background:'rgba(0,0,0,0)'}" :border-bottom="false"
-				:isFixed="false"> -->
 			<u-navbar :fixed="false" bgColor='rgba(0,0,0,0)' placeholder :safeAreaInsetTop="true">
 				<view id="height" class="index-header  u-flex u-row-between" slot="left" style="position: relative;">
 					<image @click="touser({uid:userinfo.id})" :src="userinfo.group_info.avatar"
@@ -11,16 +9,13 @@
 				</view>
 				<view id="height" class="index-header  u-flex u-row-between" slot="right" style="position: relative;">
 					<view class="navbar-right u-flex u-flex-1">
-						<!-- <view class="right-icon">
-							<u-icon name="search" size="44"></u-icon>
-						</view> -->
 						<view class="luntan-search u-flex">
 							<input v-if="searchshow" style="width: 280rpx;" type="text"
 								placeholderStyle="font-size:30rpx" placeholder="搜索你感兴趣的内容" v-model="keyword1"
 								confirm-type="search" @input="tosearch(1)" @clear='tosearch(1)'>
 							<u-icon @click="search_show" name="search" size="22"></u-icon>
 						</view>
-						<view class="right-icon" @click="toxiaoxi">
+						<view style="margin-left: 20rpx;" class="right-icon" @click="toxiaoxi">
 							<u-badge :value='number' type="error" :absolute='true' count="7" :offset="[0,8]"></u-badge>
 							<u-icon name="bell" size="22"></u-icon>
 						</view>
@@ -34,6 +29,7 @@
 					<text></text>
 				</view>
 			</view>
+			<view class="" style="height: 10rpx;"></view>
 		</view>
 		<view class="luntan-list" v-if="tabsindex == 0">
 			<view class="luntan-item" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
@@ -151,7 +147,7 @@
 			}
 		},
 		onLoad(options) {
-			this.get_total_number()
+
 			if (options.tabsindex) {
 				this.tabsindex = options.tabsindex
 			}
@@ -165,6 +161,7 @@
 				this.getlist()
 				this.getuser()
 			}
+			this.get_total_number()
 		},
 		onReachBottom() {
 			if (this.total != this.list.length) {
@@ -271,6 +268,7 @@
 						item.is_like = item.is_like ? null : {}
 						if (item.is_like) {
 							item.like_count++
+							this.get_total_number()
 						} else {
 							item.like_count--
 						}
@@ -464,7 +462,7 @@
 		}
 
 		.luntan-list {
-			padding: 20rpx 20rpx 0 24rpx;
+			padding: 0rpx 20rpx 0 24rpx;
 			box-sizing: border-box;
 
 			.luntan-item {
@@ -589,6 +587,7 @@
 			left: 0;
 			z-index: 99;
 			background: linear-gradient(180deg, #EDF6FF 0%, #FFFFFF 100%);
+			overflow: hidden;
 
 
 			.index-bg {
@@ -597,7 +596,7 @@
 				left: 0;
 				z-index: -1;
 				width: 750rpx;
-				height: 260rpx;
+				// height: 260rpx;
 			}
 
 			.header-tabs {

+ 89 - 25
pages/xiaoxi/xiaoxi.vue

@@ -4,15 +4,16 @@
 			<u-navbar :fixed="false" bgColor='rgba(0,0,0,0)' placeholder :safeAreaInsetTop="true">
 				<view slot="left" class="xiaoxi-tabs u-flex u-row-between" style="margin-left: -11rpx;">
 					<view class="tabs-item u-flex-col u-col-center u-flex-1" :class="{'tabs-item1':current == 1}"
-						@click="change(1)">
+						@click="change(1)" style="position: relative;">
 						<text>消息</text>
-						<u-badge :isDot="true" type="error" :offset="[0,0]" v-if="read"></u-badge>
+						<u-badge v-if="read" :absolute='true' :isDot="true" type="error" :offset="[0,10]"></u-badge>
 						<text></text>
 					</view>
 					<view class="tabs-item u-flex-col u-col-center u-flex-1" :class="{'tabs-item1':current == 2}"
-						@click="change(2)">
+						@click="change(2)" style="position: relative;">
 						<text>通知</text>
-						<u-badge :isDot="true" type="error" :offset="[0,0]" v-if="news_length > 0"></u-badge>
+						<u-badge :absolute='true' :isDot="true" type="error" :offset="[0,10]"
+							v-if="news_length > 0"></u-badge>
 						<text></text>
 					</view>
 				</view>
@@ -20,34 +21,40 @@
 			<view v-if="current == 1" class="tabs-header u-flex">
 				<view class="u-flex tabs-header-item" :class="{'tabs-header-active' : tabs1 == 0}"
 					@click="changetabs1(0)">
-					<u-badge :isDot="true" type="error" v-if="read"></u-badge>
 					<text>全部</text>
 				</view>
 				<view class="u-flex tabs-header-item" :class="{'tabs-header-active' : tabs1 == 1}"
-					@click="changetabs1(1)">
-					<u-badge :isDot="true" type="error" v-if="read"></u-badge>
+					style="position: relative;" @click="changetabs1(1)">
+					<u-badge v-if="read" :absolute='true' :isDot="true" type="error" :offset="[0,-10]"></u-badge>
 					<text>未读</text>
 				</view>
 			</view>
 			<view v-if="current == 2" class="tabs-header u-flex">
-				<view class="u-flex tabs-header-item" :class="{'tabs-header-active' : tabs2 == index}"
-					v-for="(item,index) in tabs2list" :key="index" @click="changetabs2(index)" v-if="index != 1">
+				<view style="position: relative;" class="u-flex tabs-header-item"
+					:class="{'tabs-header-active' : tabs2 == index}" v-for="(item,index) in tabs2list" :key="index"
+					@click="changetabs2(index)" v-if="index != 1">
 					<text>{{item}}</text>
-					<u-badge :isDot="true" type="error" v-if="read"></u-badge>
+					<u-badge v-if='index==0&&ordershow' :absolute='true' :isDot="true" type="error"
+						:offset="[0,-10]"></u-badge>
+					<u-badge v-if='index==1&&infoshow' :absolute='true' :isDot="true" type="error"
+						:offset="[0,-10]"></u-badge>
 				</view>
+
 			</view>
 		</view>
-		<view class="xiaoxi-list" v-if="current == 1">
+		<view class=" xiaoxi-list" v-if="current == 1">
 			<view class="xiaoxi-item u-flex u-row-between" v-for="(item,index) in list" :key="index"
 				@click="tochat(index)">
 				<view class="item-head">
-					<u-badge type="error" :count="item.unReadCount" :offset="[0,0]"></u-badge>
+					<!-- item.unReadCount -->
+					<u-badge :absolute='true' type="error" :value="item.unReadCount" :offset="[0,0]"></u-badge>
 					<image :src="item.user.avatar" mode=""></image>
 				</view>
 				<view class="xiaoxi-right u-flex-1">
 					<view class="right-top u-flex u-row-between">
 						<text>{{item.user.username}}</text>
-						<text class="u-line-1">{{item.user.company_name || '' }}·{{item.user.type || ''}}</text>
+						<text v-if='item.user.company_name'
+							class="u-line-1">{{item.user.company_name || '' }}·{{item.user.type || ''}}</text>
 						<text>{{ renderTime(item.lastMessage.time)}}</text>
 					</view>
 					<view class="right-down u-line-1" v-if="item.lastMessage && item.lastMessage.type == 'txt'">
@@ -145,7 +152,7 @@
 			</view>
 		</view>
 		<view class="" style="border: 40rpx;"></view>
-		<view style="height: 70vh;" v-if="list.length == 0">
+		<view style="height: 70vh;display: flex;justify-content: center;align-items: center;" v-if="list.length == 0">
 			<u-empty text="暂无数据" mode="list"></u-empty>
 		</view>
 	</view>
@@ -171,24 +178,29 @@
 				tabs1: 0,
 				tabs1list: ['全部', '未读'],
 				tabs2: 0,
-				tabs2list: ['订单通知', '系统通知', '资讯通知'],
+				tabs2list: ['应聘通知', '系统通知', '资讯通知'],
 				page: 1,
 				total: 0,
 				list: [],
 				read: false,
 				renderTime,
-				news_length: 0
+				news_length: 0,
+				ordershow: false,
+				infoshow: false
 			}
 		},
 		onLoad() {
 
 		},
 		onShow() {
-			uni.setTabBarBadge({
-				index: 3,
-				text: '1'
-			})
+			// if (this.read || this.news_length > 0) {
+			// 	uni.showTabBarRedDot({
+			// 		index: 3,
+			// 	})
+			// }
+			this.read = false
 			this.getlist()
+			this.getlist1()
 			this.getnum()
 		},
 		onReachBottom() {
@@ -260,6 +272,19 @@
 				this.list = []
 				this.getlist()
 			},
+			getlist1() {
+				get_list({
+					page: this.page,
+					type: 'info'
+				}).then(res => {
+					this.total = res.data.total
+					res.data.data.forEach(item => {
+						if (item.is_view == 0) {
+							this.infoshow = true
+						}
+					})
+				})
+			},
 			getlist() {
 				let that = this
 				if (this.current == 1) {
@@ -271,15 +296,41 @@
 						that.list = res.data.conversations
 						console.log(that.list);
 						let list = []
-						if (that.tabs1 == 1) {
-							for (var i = 0; i < that.list.length; i++) {
-								if (that.list[i].unReadCount > 0) {
-									this.read = true
+						for (var i = 0; i < that.list.length; i++) {
+							if (that.list[i].unReadCount > 0) {
+								if (that.tabs1 == 1) {
 									list.push(that.list[i])
 								}
+								this.$set(this, 'read', true)
 							}
+						}
+						if (this.read || this.news_length > 0) {
+							uni.showTabBarRedDot({
+								index: 3,
+								success(res) {
+									console.log(res);
+								}
+							})
+
+						} else {
+							uni.hideTabBarRedDot({
+								index: 3,
+								success(res) {
+									console.log(res);
+								}
+							})
+						}
+						if (that.tabs1 == 1) {
 							that.list = list
 						}
+						// if (that.tabs1 == 1) {
+						// 	for (var i = 0; i < that.list.length; i++) {
+						// 		if (that.list[i].unReadCount > 0) {
+						// 			list.push(that.list[i])
+						// 		}
+						// 	}
+						// 	that.list = list
+						// }
 						let ids = ''
 						if (that.list.length > 0) {
 							for (var i = 0; i < that.list.length; i++) {
@@ -301,7 +352,20 @@
 						} [this.tabs2]
 					}).then(res => {
 						this.total = res.data.total
-						this.list = this.list.concat(res.data.data)
+						if (this.page == 1) {
+							this.list = res.data.data
+						} else {
+							this.list = this.list.concat(res.data.data)
+						}
+						// this.list = this.list.concat(res.data.data)
+						this.list.forEach(item => {
+							if (this.tabs2 == 0 && item.is_view == 0) {
+								this.ordershow = true
+							}
+							if (this.tabs2 == 2 && item.is_view == 0) {
+								this.infoshow = true
+							}
+						})
 					})
 				}
 			},

+ 18 - 8
pagesA/Project .vue

@@ -200,22 +200,23 @@
 				uni.navigateBack()
 			},
 			todcp(index) {
-				if (this.radiovalue1 == 1) {
+				console.log(22222222222222222222222222222222222222222222222222222222222222222);
+
+				if (this.radiovalue1 == 2) {
 					uni.navigateTo({
-						url: '../pagesA/description?concent=' + this.project_experience.description,
+						url: '../pagesA/description?concent=' + this.project_experience3[index].description,
 						events: {
 							todcp: (res) => {
-								this.project_experience.description = res
+								this.project_experience3[index].description = res
 							}
 						}
 					})
-				}
-				if (this.radiovalue1 == 2) {
+				} else {
 					uni.navigateTo({
-						url: '../pagesA/description?concent=' + this.project_experience3[index].description,
+						url: '../pagesA/description?concent=' + this.project_experience.description,
 						events: {
 							todcp: (res) => {
-								this.project_experience3[index].description = res
+								this.project_experience.description = res
 							}
 						}
 					})
@@ -224,38 +225,47 @@
 			},
 			next() {
 				if (this.radiovalue1 == 2) {
+					var tongguo = true
 					this.project_experience3.forEach((item) => {
 						for (var key in item) {
 							console.log(key);
 							if (key == "company_name" && item[key] == "") {
 								this.$u.toast("请填写公司名称")
+								tongguo = false
 								return
 							}
 							if (key == "name" && item[key] == "") {
 								this.$u.toast("请填写项目名称")
+								tongguo = false
 								return
 							}
 							if (key == "start_time" && item[key] == "") {
 								this.$u.toast("请填写项目开始时间")
+								tongguo = false
 								return
 							}
 							if (key == "end_time" && item[key] == "") {
 								this.$u.toast("请填写项目项目结束时间")
+								tongguo = false
 								return
 							}
 							if (key == "description" && item[key] == "") {
 								this.$u.toast("请填写项目描述")
+								tongguo = false
 								return
 							}
 							if (key == "role" && item[key] == "") {
 								this.$u.toast("请填写项目角色")
+								tongguo = false
 								return
 							}
 						}
+					})
+					if (tongguo) {
 						uni.navigateTo({
 							url: '../pagesA/teach'
 						})
-					})
+					}
 				} else {
 					if (!this.project_experience.name) {
 						this.$u.toast("请填写项目名称")

+ 3 - 2
pagesA/expectation.vue

@@ -111,7 +111,7 @@
 				job_intention: {
 					city: "", //城市地点
 					advantage: '', //优势亮点
-					salary:'',
+					salary: '',
 					province_id: "", //期望省份ID
 					city_id: "", //期望城市ID
 					salary_type: "", //薪资类型: year = 年薪;month = 月薪
@@ -331,10 +331,11 @@
 					job_intention: [this.job_intention]
 				}).then(res => {
 					if (res.code == 1) {
-						this.$u.toast(res.msg)
 						uni.switchTab({
 							url: '../pages/index/index'
 						})
+					} else {
+						this.$u.toast(res.msg)
 					}
 				})
 				uni.setStorageSync("category_industry_name", this.category_industry_name)

+ 47 - 16
pagesA/index-search.vue

@@ -8,21 +8,11 @@
 						<text class="text1" :class="{textactive:paixu == 1}" @click="changepaixu(1)">按职位</text>
 						<text class="text1" :class="{textactive:paixu == 2}" @click="changepaixu(2)">搜公司</text>
 					</view>
-					<!-- <view class="u-flex down-right">
-						<view @click="opencity = true" class="u-flex right-item u-row-center">
-							<text class="text">{{city.name || '全国'}}</text>
-							<u-icon name="arrow-down-fill" size="20"></u-icon>
-						</view>
-						<view @click="$refs.shaixuan.openshaixuan = true" class="u-flex right-item u-row-center">
-							<text class="text">筛选</text>
-							<u-icon name="arrow-down-fill" size="20"></u-icon>
-						</view>
-					</view> -->
 					<view class="u-flex down-right">
 						<view :style="{background:city.name!=''?'#EDF2F8':'#f3f3f3'}"
 							class="right-item u-flex u-row-center" @click="opencity1">
 							<text :style="{color:city.name!=''?'#0C66C2':'#666666'}"
-								class="text">{{city.name || '北京'}}</text>
+								class="text">{{city.name || '全国'}}</text>
 							<u-icon v-if="city.name !='' " color="#0C66C2" name="arrow-down-fill" size="8"></u-icon>
 							<u-icon v-if="city.name ==''" name="arrow-down-fill" size="8"></u-icon>
 						</view>
@@ -81,9 +71,18 @@
 			</view>
 			<view class="safe-area-inset-bottom"></view>
 		</view>
-		<view style="height: 70vh;display: flex;justify-content: center;align-items: center;"
-			v-if="positionlist.length == 0">
-			<u-empty text="暂无数据" mode="list"></u-empty>
+		<view style="height: 85vh;padding: 0 24rpx;background-color: #fff;" v-if="positionlist.length == 0">
+			<view class="u-flex u-row-between">
+				<view class="shar">历史搜索</view>
+				<view class="" @click="clear">
+					<u-icon  name="trash" color="rgba(0,0,0,.7)" size="14"></u-icon>
+				</view>
+			</view>
+			<view class="u-flex" style="flex-wrap: wrap;margin-top: 24rpx;">
+				<view class="item" style="margin-right: 16rpx;" v-for="(item,index) in search" :key="index">
+					{{item}}
+				</view>
+			</view>
 		</view>
 		<u-popup border-radius="28" :show="opencity" mode="bottom">
 			<view class="change-city-popup u-flex-col">
@@ -123,7 +122,7 @@
 	export default {
 		data() {
 			return {
-				paixu: '',
+				paixu: 1,
 				keyword: "",
 				keyword1: "",
 				category_industry_id: "",
@@ -162,11 +161,15 @@
 				job_intention: [],
 				id: "",
 				navheight: null,
+				search: []
 			}
 		},
 		onLoad() {
+			if (uni.getStorageSync('searchdata')) {
+				this.search = uni.getStorageSync('searchdata')
+			}
 			this.search_data = {}
-			this.getlist()
+			// this.getlist()
 			this.getcity()
 			this.city = {
 				name: '',
@@ -180,6 +183,10 @@
 			}
 		},
 		methods: {
+			clear(){
+				uni.removeStorageSync('searchdata')
+				this.search = []
+			},
 			changepaixu(type) {
 				this.paixu = type
 				this.tosearch()
@@ -239,6 +246,10 @@
 				this.page = 1
 				this.total = 0
 				this.getlist()
+				if(this.keyword1 != ''){
+					this.search.push(this.keyword1)
+				}
+				uni.setStorageSync('searchdata', this.search)
 			},
 			openshaixuan() {
 				this.$refs.shaixuan.openshaixuan = true
@@ -268,6 +279,26 @@
 </script>
 
 <style lang="scss">
+	.item {
+		height: 54rpx;
+		background: #F3F3F3;
+		border-radius: 6rpx;
+		line-height: 54rpx;
+		text-align: center;
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #222222;
+		padding: 0 18rpx;
+	}
+
+	.shar {
+		font-size: 34rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		color: #222222;
+	}
+
 	page {
 		background-color: #F3F3F3;
 	}

+ 10 - 3
pagesA/jianli.vue

@@ -93,10 +93,16 @@
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="politicsShow = true">
 				<text class="input-title">政治面貌</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择(选填)" border placeholderClass='input-style' suffixIcon="arrow-right"
+				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请选择(选填)"
+					border placeholderClass='input-style' suffixIcon="arrow-right"
 					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
-					v-model="user.politics"></u--input>
+					v-model="user.politics"></u--input>   
+			</view>
+			<view v-if="nowork != 1" class="body-input u-flex-col u-row-center" >
+				<text class="input-title">个人优势</text>
+				<u--input  disabledColor="#fff" customStyle="padding:0 !important" type="text"
+					placeholder="请填写个人优势" border placeholderClass='input-style'
+					v-model="user.personal_advantage"></u--input>
 			</view>
 			<view class="button" @click="next">
 				下一步
@@ -183,6 +189,7 @@
 					status: "",
 					job: "",
 					city2: '',
+					personal_advantage: '',
 				},
 				minDate: "",
 				minDate1: "",

+ 55 - 37
pagesA/tel-login.vue

@@ -153,47 +153,14 @@
 							uni.setStorageSync("token", res.data.userinfo.token)
 							uni.setStorageSync("user_id", res.data.userinfo.id)
 							uni.setStorageSync("is_profile", res.data.userinfo.group_info.is_profile)
-							if (res.data.userinfo.group_info.city_id == 0) {
+							if (res.data.userinfo.group_info.is_resume == 0 && uni.getStorageSync(
+									job_experience1)) {
 								setTimeout(() => {
 									uni.navigateTo({
-										url: "/pagesA/yaoqing"
+										url: "/pagesA/work"
 									})
 								}, 800)
-							} else {
-								setTimeout(() => {
-									uni.switchTab({
-										url: "/pages/index/index"
-									})
-								}, 800)
-							}
-						} else {
-							this.$u.toast(res.msg)
-						}
-					})
-				} else {
-					mobileLogin({
-						mobile: this.tel,
-						captcha: this.code,
-						is_auth: 1,
-						is_agree: 1
-					}).then(res => {
-						if (res.code == 1) {
-							this.$u.toast("登录成功")
-							var options = {
-								user: res.data.userinfo.user_no,
-								pwd: res.data.userinfo.emchat_password,
-								appKey: conn.appkey,
-								success: function(res2) {
-									uni.setStorageSync('user_no', res.data.userinfo.user_no)
-									uni.setStorageSync('pwd', res.data.userinfo.emchat_password)
-								},
-								error: function() {}
-							};
-							conn.open(options);
-							uni.setStorageSync("token", res.data.userinfo.token)
-							uni.setStorageSync("user_id", res.data.userinfo.id)
-							uni.setStorageSync("is_profile", res.data.userinfo.group_info.is_resume)
-							if (res.data.userinfo.group_info.city_id == 0) {
+							} else if (res.data.userinfo.group_info.city_id == 0) {
 								setTimeout(() => {
 									uni.navigateTo({
 										url: "/pagesA/yaoqing"
@@ -210,6 +177,57 @@
 							this.$u.toast(res.msg)
 						}
 					})
+				} else {
+					var that = this
+					wx.login({
+						success(loginres) {
+							if (loginres.code) {
+								mobileLogin({
+									code: loginres.code,
+									mobile: that.tel,
+									captcha: that.code,
+									is_auth: 1,
+									is_agree: 1
+								}).then(res => {
+									if (res.code == 1) {
+										that.$u.toast("登录成功")
+										var options = {
+											user: res.data.userinfo.user_no,
+											pwd: res.data.userinfo.emchat_password,
+											appKey: conn.appkey,
+											success: function(res2) {
+												uni.setStorageSync('user_no', res.data.userinfo
+													.user_no)
+												uni.setStorageSync('pwd', res.data.userinfo
+													.emchat_password)
+											},
+											error: function() {}
+										};
+										conn.open(options);
+										uni.setStorageSync("token", res.data.userinfo.token)
+										uni.setStorageSync("user_id", res.data.userinfo.id)
+										uni.setStorageSync("is_profile", res.data.userinfo.group_info
+											.is_resume)
+										if (res.data.userinfo.group_info.city_id == 0) {
+											setTimeout(() => {
+												uni.navigateTo({
+													url: "/pagesA/yaoqing"
+												})
+											}, 800)
+										} else {
+											setTimeout(() => {
+												uni.switchTab({
+													url: "/pages/index/index"
+												})
+											}, 800)
+										}
+									} else {
+										that.$u.toast(res.msg)
+									}
+								})
+							}
+						}
+					})
 				}
 			}
 		}

+ 44 - 7
pagesA/work.vue

@@ -71,9 +71,9 @@
 						placeholder="请填写离职原因" border placeholderClass='input-style'
 						v-model="job_experience3[index].level_reason"></u--input>
 				</view>
-				<view class="body-input u-flex-col u-row-center">
+				<view class="body-input u-flex-col u-row-center" @click="toworktion">
 					<text class="input-title">工作内容</text>
-					<u--input :value="item.work_content" customStyle="padding:0 !important" type="text"
+					<u--input :disabled="true" :value="item.work_content" customStyle="padding:0 !important" type="text"
 						placeholder="请填写工作内容" border placeholderClass='input-style'
 						v-model="job_experience3[index].work_content"></u--input>
 				</view>
@@ -128,9 +128,9 @@
 				<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写离职原因"
 					border placeholderClass='input-style' v-model="job_experience.level_reason"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center">
+			<view class="body-input u-flex-col u-row-center" @click="toworktion">
 				<text class="input-title">工作内容</text>
-				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写工作内容" border
+				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写工作内容" border
 					placeholderClass='input-style' v-model="job_experience.work_content"></u--input>
 			</view>
 			<view class="button" @click="next">
@@ -190,6 +190,27 @@
 			getdata(item) {
 				console.log(item);
 			},
+			toworktion(index) {
+				if (this.radiovalue1 == 2) {
+					uni.navigateTo({
+						url: '../pagesA/worktion?concent=' + this.job_experience[index].work_content,
+						events:{
+							todcp:res=>{
+								this.job_experience[index].work_content = res
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '../pagesA/worktion?concent=' + this.job_experience.work_content,
+						events:{
+							todcp:res=>{
+								this.job_experience.work_content = res
+							}
+						}
+					})
+				}
+			},
 			tohangye(index) {
 				uni.navigateTo({
 					url: "../pagesA/change-hangye1",
@@ -199,7 +220,6 @@
 							this.job_experience.industry_id = res[1].id
 							this.job_experience.industry_name = res[1].name
 							if (this.radiovalue1 == 2) {
-								// this.job_experience3[index].industry_id = res[1].id
 								this.job_experience3[index].industry_name = res[1].name
 							}
 						}
@@ -224,46 +244,61 @@
 			},
 			next() {
 				if (this.radiovalue1 == 2) {
+					var tongguo = true
 					this.job_experience3.forEach((item) => {
+						console.log('导入', item);
 						for (var key in item) {
+							console.log('key', key);
+							console.log('key', item[key]);
 							if (key == "company_name" && item[key] == "") {
 								this.$u.toast("请填写公司名称")
+								tongguo = false
 								return
 							}
-							if (key == "industry_name" && item[key] == "") {
+							if (key == "industry_name" && !item[key]) {
+								tongguo = false
 								this.$u.toast("请选择您的公司行业")
 								return
 							}
 							if (key == "department" && item[key] == "") {
+								tongguo = false
 								this.$u.toast("请填写您的所属部门")
 								return
 							}
 							if (key == "job_name" && item[key] == "") {
+								tongguo = false
 								this.$u.toast("请填写您的职业名称")
 								return
 							}
 							if (key == "start_time" && item[key] == "") {
+								tongguo = false
 								this.$u.toast("请选择入职时间")
 								return
 							}
 							if (key == "end_time" && item[key] == "") {
+								tongguo = false
 								this.$u.toast("请选择离职时间")
 								return
 							}
 							if (key == "level_reason" && item[key] == "") {
+								tongguo = false
 								this.$u.toast("请填写离职原因")
 								return
 							}
 							if (key == "work_content" && item[key] == "") {
+								tongguo = false
 								this.$u.toast("请填写工作内容")
 								return
 							}
 						}
+					})
+					if (tongguo) {
 						uni.navigateTo({
 							url: "/pagesA/Project "
 						})
-					})
+					}
 				} else {
+
 					if (!this.job_experience.company_name) {
 						this.$u.toast("请填写公司名称")
 						return
@@ -306,6 +341,8 @@
 				uni.setStorageSync("job_experience", nObj)
 				uni.setStorageSync("job_experience1", this.job_experience)
 				uni.setStorageSync("job_experience3", this.job_experience3)
+				return
+
 			}
 		}
 	}

+ 3 - 2
pagesA/worktion.vue

@@ -24,8 +24,9 @@
 			}
 		},
 		onLoad(options) {
-			if (options.concant) {
-				this.concant = options.concant
+			console.log(options);
+			if (options.concent) {
+				this.concant = options.concent
 			}
 		},
 		methods: {

+ 7 - 0
pagesC/changyong-list.vue

@@ -7,6 +7,10 @@
 			<image @click="emit(item.content,item.id)" src="/pagesC/static/edit.png" mode=""></image>
 			<image @click="dell(item.id)" src="/pagesC/static/del.png" mode=""></image>
 		</view>
+		<view style="height: 70vh;display: flex;justify-content: center;align-items: center;"
+			v-if="changList.length == 0">
+			<u-empty text="暂无数据" mode="list"></u-empty>
+		</view>
 		<view class="changyong-down">
 			<view class="u-flex u-row-center changyong-btn">
 				<text @click="toadd">添加常用语</text>
@@ -32,6 +36,9 @@
 			}
 		},
 		onLoad() {
+
+		},
+		onShow() {
 			this.getlist()
 		},
 		methods: {

+ 15 - 4
pagesC/chat.vue

@@ -133,9 +133,11 @@
 </template>
 
 <script>
+	import vueBus from '@/utils/vueBus.js'
 	import {
 		phraseList,
-		getEmchatUsersData
+		getEmchatUsersData,
+		index
 	} from "../units/inquire.js"
 	import WebIM from '@/newSDK/Easemob-chat.js'
 	import {
@@ -164,9 +166,18 @@
 		onLoad(options) {
 			this.statusheight = uni.getSystemInfoSync().statusBarHeight
 			this.user_other_no = options.user_no
-			this.user_no = uni.getStorageSync('user_no')
-			this.getuser()
-			this.getdata()
+			if (uni.getStorageSync('user_no')) {
+				this.user_no = uni.getStorageSync('user_no')
+				this.getuser()
+				this.getdata()
+			} else {
+				index().then((res) => {
+					this.user_no = res.data.user_no
+					this.getuser()
+					this.getdata()
+				})
+			}
+			vueBus.$on('message', this.getdata)
 		},
 		onShow() {
 			this.getlist()

+ 4 - 2
pagesC/xiaoxi-list.vue

@@ -55,7 +55,7 @@
 					</view>
 					<view class="huifu-btn u-flex u-row-center" @click.stop="guan(item)">
 						<text v-if="item.follow">已关注</text>
-						<view v-else class="">
+						<view v-else class="u-flex">
 							<image src="../static/images/plus.png" mode=""></image>
 							<text>关注</text>
 						</view>
@@ -280,11 +280,13 @@
 			.pinglun-yuan {
 				background: #F6F6F6;
 				border-radius: 12rpx;
-				padding: 20rpx;
+				padding: 0 20rpx;
 				font-size: 26rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #444444;
+				height: 60rpx;
+				line-height: 60rpx;
 			}
 
 			.list-item {

+ 2 - 2
pagesD/advantage.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="page">
 		<view class="title">
-			工作内容
+			我的优势
 		</view>
 		<view class="" style="margin-top: 32rpx;">
-			<textarea v-model="concant" style="width: 100%;height: 80vh;" class="txt_word" placeholderClass='concant' placeholder="简述工作背景、曾负责的工作内容、客服过的内容取得的工作成果\n\n\n具体工作为\n1.负责*** \n2.参与*** \n3.完成***"></textarea>
+			<textarea v-model="concant" style="width: 100%;height: 80vh;" class="txt_word" placeholderClass='concant' placeholder="写下你最擅长的事情,展示你的特别之处,分享你再工作中取得的成绩"></textarea>
 		</view>
 		<view class="button" @click="toteach">
 			保存

+ 13 - 9
pagesD/apply.vue

@@ -20,13 +20,17 @@
 		<view class="body-input u-flex-col u-row-center">
 			<text class="input-title">期望薪资</text>
 			<view class="u-flex u-row-between">
-				<view style="width: 80rpx;" class="" @click="salarytype = true">{{salary_type}}</view>
-				<u-icon name="arrow-down-fill" color="#000" size="8"></u-icon>
-				<u--input border style='width:50rpx' class=""
-					v-model="job_intention.salary">{{job_intention.salary||''}}</u--input>元
-				<text>*</text>
-				<u--input border style='width:50rpx' class=""
-					v-model="job_intention.salary_month">{{job_intention.salary_month||''}}</u--input>个月
+				<view style="width: 80rpx;color: rgba(26, 28, 36, 0.8);font-size: 30rpx;" class=""
+					@click="salarytype = true">
+					{{salary_type}}
+				</view>
+				<u-icon name="arrow-down-fill" color="rgba(26, 28, 36, 0.8)" size="8"></u-icon>
+				<u--input inputAlign='center' border style='width:50rpx' class=""
+					v-model="job_intention.salary">{{job_intention.salary||''}}</u--input>K
+				<text style="margin-left: 100rpx;">*</text>
+				<u--input inputAlign='center' border style='width:50rpx' class=""
+					v-model="job_intention.salary_month">{{job_intention.salary_month||''}}</u--input>
+				<text style="color: rgba(26, 28, 36, 0.8);font-size: 30rpx;">薪资</text>
 			</view>
 		</view>
 		<!-- 		<view class="body-input u-flex-col u-row-center" @click="changehangye">
@@ -374,7 +378,7 @@
 							this.category_job_name = item.category_job_name
 							this.job_intention.category_job_second = item.category_job_second
 							this.category_job_second_name = item.category_job_second_name
-							this.city1 = item.province + item.city
+							this.city1 = item.city + item.province
 							this.job_intention.city_id = item.city_id
 							this.job_intention.is_pay = item.is_pay
 							if (this.job_intention.is_pay == 0) {
@@ -420,7 +424,7 @@
 					...this.job_intention
 				}).then(res => {
 					const eventChannel = this.getOpenerEventChannel();
-					eventChannel.emit('refresh', '');
+					eventChannel.emit('refresh', this.job_intention);
 					uni.navigateBack()
 				})
 			},

+ 31 - 27
pagesD/apply1.vue

@@ -4,17 +4,18 @@
 			<text class="title">求职意向</text>
 			<view class="titleb">不同的求职意向,会为您推荐不同的职位</view>
 		</view>
-		<view class="u-flex content u-row-between" v-for="(item,index) in job_intention" :key="item.id" @click="toapply1(2,item.id)">
+		<view class="u-flex content u-row-between" v-for="(item,index) in job_intention" :key="item.id"
+			@click="toapply1(2,item.id)">
 			<view class="biaoti">
 				<view class="">
-					<view v-if="item.is_pay" class="fei" >付费</view>
+					<view v-if="item.is_pay" class="fei">付费</view>
 					<text>{{item.province.slice(0,-1)}}</text>
 					<text style="margin: 0 20rpx;">|</text>
 					<text>{{item.category_job_name}}</text>
 				</view>
 				<view class="money">
-					<text>{{item.salary}}K·</text>
-					<text>{{item.category_industry_name|| "行业不限"}}</text>
+					<text>{{item.salary||''}}K·</text>
+					<text>{{item.category_industry_name|| ""}}</text>
 				</view>
 			</view>
 			<u-icon name="arrow-right" color="#4C4C4C" size="24"></u-icon>
@@ -29,7 +30,7 @@
 				<u-icon name="arrow-right" color="#4C4C4C" size="16"></u-icon>
 			</view>
 		</view>
-		<u-picker @cancel="show = false" :show="show" :columns="columns" keyName="name"  @confirm="enter"></u-picker>
+		<u-picker @cancel="show = false" :show="show" :columns="columns" keyName="name" @confirm="enter"></u-picker>
 	</view>
 </template>
 
@@ -43,7 +44,7 @@
 	export default {
 		data() {
 			return {
-				show:false,
+				show: false,
 				value: false,
 				province: [], //省数据
 				city: [], //市数据
@@ -60,11 +61,13 @@
 				cityList: [], //数据地址
 				cityids: [], //数据地址
 				joblist: [],
-				job_status_id:"",
-				job_status_name:"",
-				columns:[[]],
-				job_intention:[],
-				source_id:''
+				job_status_id: "",
+				job_status_name: "",
+				columns: [
+					[]
+				],
+				job_intention: [],
+				source_id: ''
 			}
 		},
 		onLoad() {
@@ -73,37 +76,37 @@
 			this.get_job_status()
 		},
 		methods: {
-			toapply1(type,id){
+			toapply1(type, id) {
 				uni.navigateTo({
-					url:"/pagesD/apply?type="+type+"&id="+id,
-					events:{
-						refresh:(res)=>{
+					url: "/pagesD/apply?type=" + type + "&id=" + id,
+					events: {
+						refresh: (res) => {
 							this.resumeDetail()
 						}
 					}
 				})
 			},
-			resumeDetail(){
-				resumeDetail().then(res=>{
+			resumeDetail() {
+				resumeDetail().then(res => {
 					this.source_id = res.data.id
 					this.job_intention = res.data.job_intention
 					this.job_status_name = res.data.job_status_name
 				})
 			},
-			enter(e){
+			enter(e) {
 				update({
-					source_type:"resume",
-					source_id:this.source_id,
+					source_type: "resume",
+					source_id: this.source_id,
 					job_status_id: e.value[0].id
-				}).then(res=>{
+				}).then(res => {
 					this.resumeDetail()
 				})
 				this.job_status_name = e.value[0].name
 				this.show = false
 			},
-			get_job_status(){
-				get_job_status().then(res=>{
-					this.columns[0] =  res.data
+			get_job_status() {
+				get_job_status().then(res => {
+					this.columns[0] = res.data
 				})
 			},
 			//所有地区
@@ -259,8 +262,8 @@
 		margin-top: 32rpx;
 		position: relative;
 	}
-	
-	.fei{
+
+	.fei {
 		background: #FF5335;
 		border-radius: 16rpx 0rpx 16rpx 0rpx;
 		font-size: 22rpx;
@@ -271,6 +274,7 @@
 		left: 0;
 		top: 0;
 	}
+
 	.add {
 		background: rgba(12, 102, 194, 0.05);
 		border-radius: 12rpx;
@@ -290,7 +294,7 @@
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #222222;
-		
+
 	}
 
 	.money {

+ 15 - 11
pagesD/change-name.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="change-name">
 		<view class="name-box u-flex u-row-between">
-			<input type="text" maxlength="12" placeholder="请输入姓名" v-model="name.name">
+			<input type="text" maxlength="12" placeholder="请输入姓名" v-model="name.virtual_name">
 			<text>12</text>
 		</view>
 		<view class="name-tips u-flex">
-			<u-checkbox-group>
-				<u-checkbox v-model="value" size="26" active-color="#0C66C2" shape="circle">
+			<u-checkbox-group v-model="value">
+				<u-checkbox :name='1' size="26" active-color="#0C66C2" shape="circle">
 				</u-checkbox>
-				<text class="text">显示先生/女士</text>
 			</u-checkbox-group>
+			<text class="text">显示先生/女士</text>
 		</view>
 		<view class="user-down">
 			<view class="down-btn u-flex">
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				value: false,
+				value: [],
 				name: {
 					name: '',
 					virtual_name: ''
@@ -33,22 +33,26 @@
 		},
 		onLoad(option) {
 			this.name = JSON.parse(option.name)
+			console.log('pppp', option.name);
+			if (JSON.parse(option.name).virtual_name == '') {
+				this.name.virtual_name = JSON.parse(option.name).name
+			}
 			if (this.name.name != this.name.virtual_name) {
-				this.value = true
+				this.value = [1]
 			} else {
-				this.value = false
+				this.value = []
 			}
 		},
 		methods: {
 			save() {
-				if (!this.name.name) {
+				if (!this.name.virtual_name) {
 					this.$u.toast("请输入姓名")
 					return
 				}
-				if (this.value) {
-					this.name.name = this.name.name
+				if (this.value.length > 0) {
+					this.name.name = ''
 				} else {
-					this.name.name = this.name.name
+					this.name.name = this.name.virtual_name
 				}
 				const eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('getname', this.name);

+ 1 - 1
pagesD/my-order.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="my-order">
 		<view class="my-order-header">
-			<!-- 			<view class="header-search u-flex">
+			<!-- 						<view class="header-search u-flex">
 				<u-icon name="search" size="36" color="#444444"></u-icon>
 				<input type="text" class="input" placeholder="请输入关键词搜索" v-model="keyword1" confirm-type="search"
 					@confirm="tosearch(1)">

+ 38 - 108
pagesD/order-info.vue

@@ -69,6 +69,8 @@
 				<text class="text1" v-if="detail.entry_status == 'entry'">已入职</text>
 				<text class="text1" v-if="detail.entry_status == 'failed'">已淘汰</text>
 				<u-icon name="arrow-up-fill" style="transform: rotate(90deg);" color="#fff" size="12"></u-icon>
+				<text class="dakuan-icon"
+					v-if="detail.is_pay_for_job == 1 && detail.candidate_commission_amount && detail.candidate_pay_status != 'paid'">未支付</text>
 			</view>
 			<view class="header-title u-flex" @click="showjinzhan = true" v-if="detail.stage == 'over_protected'">
 				<text class="text1" v-if="detail.over_protected_status == 'pending'">待反馈</text>
@@ -77,13 +79,14 @@
 				<text class="text1" v-if="detail.over_protected_status == 'failed'">已淘汰</text>
 				<u-icon name="arrow-up-fill" style="transform: rotate(90deg);" color="#fff" size="12"></u-icon>
 				<text class="text2" v-if="detail.over_protected_status == 'failed'">已淘汰</text>
-				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'unpaid'">未支付</text>
-				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'paying'">支付中</text>
+				<text class="dakuan-icon"
+					v-if="detail.is_pay_for_job == 1 && detail.candidate_commission_amount && detail.candidate_pay_status != 'paid'">未支付</text>
+				<!-- 			<text class="dakuan-icon" v-if="detail.hr_pay_status == 'paying'">支付中</text>
 				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'part'">部分支付</text>
 				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'paid'">已支付</text>
 				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'refunding'">退款中</text>
 				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'refunded'">已退款</text>
-				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'overdue'">已逾期</text>
+				<text class="dakuan-icon" v-if="detail.hr_pay_status == 'overdue'">已逾期</text> -->
 			</view>
 			<!-- status.状态:unpaid=未支付,paying=支付中,paid=已支付,refunding=退款中,refunded=已退款,overdue.已逾期, discount_amount.折扣金额 -->
 			<view class="order-time">
@@ -174,10 +177,6 @@
 								<text>第{{item.period}}轮</text>
 							</view>
 						</view>
-						<!-- 					<view class="mianshi-item u-flex u-row-between">
-									<text>面试轮次</text>
-									<text>{{item.period_sum}}轮</text>
-								</view> -->
 						<view class="mianshi-item u-flex u-row-between">
 							<text>面试方式</text>
 							<text>{{item.type == 'offline' ? '线下面试' : '线上面试'}}</text>
@@ -251,7 +250,7 @@
 							<image :src="detail.hr.avatar" mode=""
 								style="width: 50rpx;height: 50rpx;border-radius: 50%;">
 							</image>
-							<view class="" style="margin-left: 16rpx;">
+							<view class="" style="margin-left: 16rpx;font-size: 24rpx;">
 								<text>{{detail.hr.name}}</text>·
 								<text>{{detail.hr.job}}</text>
 							</view>
@@ -273,83 +272,15 @@
 					<text>{{detail.createtime || ''}}</text>
 				</view>
 			</view>
-			<!-- 			<view class="pay-box" v-if="detail.hr_periods && detail.hr_periods.length > 0">
-				<view class="pay-header u-flex u-row-between">
-					<text class="text1">支付方式</text>
-					<view class="u-flex">
-						<text class="text2">{{detail.hr_periods.length}}次付款</text>
-						<u-icon name="info-circle-fill" color="#999999" size="24"></u-icon>
-					</view>
-				</view>
-				<view class="pay-item u-flex u-col-top u-row-between" v-for="(a,b) in detail.hr_periods" :key="b">
-					<text class="text1">{{a.normal_time}}</text>
-					<view class="u-flex-col u-col-center">
-						<text class="xian1"></text>
-					</view>
-					<view class="text2 u-flex u-row-right">
-						<text class="price" v-if="a.status == 'paid'" style="color: #76777D;">¥{{a.normal_price}}</text>
-						<text class="price" v-else-if="a.status == 'unpaid'"
-							style="color: #1A1C24">¥{{a.normal_price}}</text>
-						<text class="price" v-else style="color: #F2413A;">¥{{a.normal_price}}</text>
-						<text class="price-status1" v-if="a.status == 'paid'">已打款</text>
-						<text class="price-status2" v-if="a.status == 'paying'">支付中</text>
-						<text class="price-status2" v-if="a.status == 'refunding'">退款中</text>
-						<text class="price-status2" v-if="a.status == 'refunded'">已退款</text>
-						<text class="price-status2" v-if="a.status == 'overdue'">已逾期</text>
-					</view>
-				</view>
-				<view class="safe-area-inset-bottom"></view>
-			</view> -->
 		</view>
-		<!-- 		<view class="tuijian-box" v-if="detail.resume_recommend">
-			<view class="tuijian-header u-flex u-row-between">
-				<text>推荐信息</text>
-				<text>推荐时间:{{detail.resume_recommend.createtime}}</text>
-			</view>
-			<view class="tuijian-item u-flex u-row-between">
-				<text>推荐理由</text>
-				<text>{{detail.resume_recommend.recommend_reason}}</text>
-			</view>
-			<view class="tuijian-item u-flex u-row-between">
-				<text>求职理由</text>
-				<text>{{detail.resume_recommend.job_reason}}</text>
-			</view>
-			<view class="tuijian-item u-flex u-row-between">
-				<text>离职周期</text>
-				<text>{{detail.resume_recommend.resign_period_text}}</text>
-			</view>
-			<view class="tuijian-item u-flex u-row-between">
-				<text>目前薪资</text>
-				<text>{{Number(detail.resume_recommend.current_salary)}}K/{{detail.resume_recommend.current_salary_type == 'month' ? '月' : '年'}}</text>
-			</view>
-			<view class="tuijian-item u-flex u-row-between">
-				<text>期望薪资</text>
-				<text>{{Number(detail.resume_recommend.expect_salary)}}K/{{detail.resume_recommend.expect_salary_type == 'month' ? '月' : '年'}}</text>
-			</view>
-			<view class="tuijian-item u-flex u-row-between">
-				<text>可约面时间</text>
-				<text>{{detail.resume_recommend.interview_time}}</text>
-			</view>
-			<view class="tuijian-user u-flex u-row-between" v-if="detail.recommend_info">
-				<image :src="detail.recommend_info.avatar" class="user-img" mode=""></image>
-				<view class="user-center u-flex-1 u-flex-col">
-					<text>{{detail.recommend_info.username}}</text>
-					<text>{{detail.recommend_info.type}}</text>
-				</view>
-				<text class="chat-btn">立即聊聊</text>
-			</view>
-		</view> -->
-		<!-- <view style="height: 100rpx;"></view> -->
-		<!-- <view class="safe-area-inset-bottom"></view> -->
+		<view class="" style="height: 100rpx;background: #F3F3F3;"></view>
 		<view class="jieshou-down">
-			<view v-if="detail.stage == 'over_protected'">
+			<view v-if="detail.stage == 'over_protected' ||detail.stage == 'entry' ">
 				<view class="jieshou-btn u-flex u-row-right">
-					<!-- unpaid.未支付,paying.支付中, part.部分支付,paid.已完成支付, refunding.退款中, refund_part. 部分退款, refunded.已退款 -->
 					<view
-						v-if="['unpaid','part'].includes(detail.candidate_commission_amount) ||['unentry ','progressing ','entry'].includes(detail.entry_status) || ['unentry ','progressing ','entry'].includes(detail.offer_status) "
-						class="text4" @click="todakuan">立即支付
+						v-if="detail.is_pay_for_job == 1 && detail.candidate_commission_amount && detail.candidate_pay_status != 'paid' "
+						class="text4" @click="todakuan(detail.candidate_commission_amount )">立即支付
 					</view>
-					<!-- <view v-if="['paid'].includes(detail.hr_pay_status)" class="text4" @click="totuikuan()">申请退款</view> -->
 				</view>
 			</view>
 			<view class="safe-area-inset-bottom"></view>
@@ -614,36 +545,35 @@
 				}
 
 			},
-			todakuan() {
-				var periods_id = ''
-				var paying_id = ''
-				this.detail.hr_periods.forEach(val => {
-					if ((val.status == 'unpaid') && !periods_id) {
-						periods_id = val.id
-					}
-					if ((val.status == 'paying') && !paying_id) {
-						paying_id = val.id
-					}
-				})
-				console.log(paying_id);
-				if (paying_id) {
-					this.$u.toast("待后台审核成功后再发起支付")
-					return
-				}
-				if (periods_id) {
-					uni.navigateTo({
-						url: "/pagesD/pay?id=" + periods_id
-					})
-				} else {
-					this.$u.toast("暂无信息")
-				}
-
-			},
-			totuikuan() {
+			todakuan(money) {
+				// var periods_id = ''
+				// var paying_id = ''
+				// this.detail.hr_periods.forEach(val => {
+				// 	if ((val.status == 'unpaid') && !periods_id) {
+				// 		periods_id = val.id
+				// 	}
+				// 	if ((val.status == 'paying') && !paying_id) {
+				// 		paying_id = val.id
+				// 	}
+				// })
+				// console.log(paying_id);
+				// if (paying_id) {
+				// 	this.$u.toast("待后台审核成功后再发起支付")
+				// 	return
+				// }
+				// if (periods_id) {
 				uni.navigateTo({
-					url: "/pagesD/tuikuan?id=" + this.id
+					url: "/pagesD/pay?id=" + this.id + '&&money=' + money
 				})
-			}
+				// } else {
+				// 	this.$u.toast("暂无信息")
+				// }
+			},
+			// totuikuan() {
+			// 	uni.navigateTo({
+			// 		url: "/pagesD/tuikuan?id=" + this.id
+			// 	})
+			// }
 		}
 	}
 </script>

+ 84 - 6
pagesD/pay.vue

@@ -6,32 +6,110 @@
 			</view>
 			<view class="money">
 				<text>¥</text>
-				<text style="font-size: 76rpx;">200.00</text>
+				<text style="font-size: 76rpx;">{{money}}</text>
 			</view>
 		</view>
 		<view class="">
-			<view class="pay">请选择支付方式</view>
-			<view class="">
 
+			<view class="pay1">请选择支付方式</view>
+			<view class="u-flex u-row-between" style="margin-top: 64rpx;">
+				<view class="u-flex">
+					<image style="width: 40rpx;height: 40rpx;" src="/pagesD/static/images/wxpay.png" mode=""></image>
+					<view class="" style="margin-left: 20rpx;">微信支付</view>
+				</view>
+				<view class="">
+					<u-radio-group v-model="radiovalue1">
+						<u-radio name="1">
+						</u-radio>
+					</u-radio-group>
+				</view>
 			</view>
+
+		</view>
+		<view class=""
+			style="position: fixed;left: 0;bottom: 0;padding: 16rpx 32rpx;width: 750rpx;box-sizing: border-box;">
+			<view class="pay" style="" @click="tobuy">
+				立即支付
+			</view>
+			<view class="safe-area-inset-bottom"></view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		pay
+	} from "@/units/inquire.js"
 	export default {
 		data() {
 			return {
-
+				money: 0,
+				id: '',
+				radiovalue1: '1'
 			};
+		},
+		onLoad(options) {
+			this.money = options.money
+			this.id = options.id
+		},
+		methods: {
+			tobuy() {
+				uni.showLoading({
+					mask: true,
+					title: "请稍后"
+				})
+				pay({
+					id: this.id,
+					paytype: 'wechat',
+					apptype: 'miniapp'
+				}).then(res => {
+					uni.hideLoading()
+					if (res.code == 1) {
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: res.data.data.response.timeStamp,
+							nonceStr: res.data.data.response.nonceStr,
+							package: res.data.data.response.package,
+							signType: res.data.data.response.signType,
+							paySign: res.data.data.response.paySign,
+							success: function(res) {
+								console.log('success:' + JSON.stringify(res));
+								this.$u.toast('支付成功')  
+								setTimeout(() => {
+									uni.navigateBack()
+								})
+								// this.getdata()
+							},
+							fail: function(err) {
+								console.log('fail:' + JSON.stringify(err));
+							}
+						});
+					}
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.page{
+	.pay {
+		height: 88rpx;
+		background: #0C66C2;
+		border-radius: 12rpx;
+		line-height: 88rpx;
+		text-align: center;
+		// padding: 22rpx 0;
+		box-sizing: border-box;
+		font-size: 32rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.page {
 		padding: 0 52rpx;
 	}
+
 	.top {
 		height: 350rpx;
 	}
@@ -50,7 +128,7 @@
 		color: #222222;
 	}
 
-	.pay {
+	.pay1 {
 		font-size: 32rpx;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

+ 53 - 25
pagesD/personal-infor.vue

@@ -199,6 +199,7 @@ color: #0C66C2;">已绑定</text>
 					email: "", //邮箱
 					source_id: 43,
 					source_type: "resume",
+					virtual_name:'',
 				},
 				minDate: "",
 				minDate1: "",
@@ -271,50 +272,77 @@ color: #0C66C2;">已绑定</text>
 				})
 			},
 			tochangename() {
+				console.log('kkkk',{ name: this.from.name, virtual_name: this.from.virtual_name });
 				uni.navigateTo({
-					url: "/pagesD/change-name?name=" + JSON.stringify({
-						name: this.from.name,
-					}),
+					
+					url: "/pagesD/change-name?name=" + JSON.stringify({ name: this.from.name, virtual_name: this.from.virtual_name }),
 					events: {
 						getname: (res) => {
-							console.log(res);
 							if (res.name) {
+								this.from.name = res.name
+							} else {
 								var name = ''
 								fuxing.forEach(val => {
-									if (res.name.indexOf(val) > -1) {
-										name = name[0] + res.name[1] + (this
-											.from.sex == 'female' ? '女士' : '先生')
-									}
-									if (!name) {
-										name = res.name[0] + (this.from.sex == 'female' ? '女士' : '先生')
+									if (res.virtual_name.indexOf(val) > -1) {
+										name = res.virtual_name[0] + res.virtual_name[1] + (this.from.sex == 'female' ? '女士' : '先生')
 									}
 								})
-								console.log(name);
+								if (!name) {
+									name = res.virtual_name[0] + (this.from.sex == 'female' ? '女士' : '先生')
+								}
 								this.from.name = name
 							}
-							// else {
-							// 	var name = ''
-							// 	fuxing.forEach(val => {
-							// 		if (res.virtual_name.indexOf(val) > -1) {
-							// 			name = res.virtual_name[0] + res.virtual_name[1] + (this
-							// 				.from.sex == 'female' ? '女士' : '先生')
-							// 		}
-							// 	})
-							// 	if (!name) {
-							// 		name = res.virtual_name[0] + (this.from.sex == 'female' ? '女士' : '先生')
-							// 	}
-							// 	this.from.name = name
-							// }
-							// this.from.virtual_name = res.virtual_name
+							this.from.virtual_name = res.virtual_name
 						}
 					}
 				})
 			},
+			// tochangename() {
+			// 	uni.navigateTo({
+			// 		url: "/pagesD/change-name?name=" + JSON.stringify({
+			// 			name: this.from.name,
+			// 		}),
+			// 		events: {
+			// 			getname: (res) => {
+			// 				console.log(res);
+			// 				if (res.name) {
+			// 					var name = ''
+			// 					fuxing.forEach(val => {
+			// 						if (res.name.indexOf(val) > -1) {
+			// 							name = name[0] + res.name[1] + (this
+			// 								.from.sex == 'female' ? '女士' : '先生')
+			// 						}
+			// 						if (!name) {
+			// 							name = res.name[0] + (this.from.sex == 'female' ? '女士' : '先生')
+			// 						}
+			// 					})
+			// 					console.log(name);
+			// 					this.from.name = name
+			// 				}
+			// 				// else {
+			// 				// 	var name = ''
+			// 				// 	fuxing.forEach(val => {
+			// 				// 		if (res.virtual_name.indexOf(val) > -1) {
+			// 				// 			name = res.virtual_name[0] + res.virtual_name[1] + (this
+			// 				// 				.from.sex == 'female' ? '女士' : '先生')
+			// 				// 		}
+			// 				// 	})
+			// 				// 	if (!name) {
+			// 				// 		name = res.virtual_name[0] + (this.from.sex == 'female' ? '女士' : '先生')
+			// 				// 	}
+			// 				// 	this.from.name = name
+			// 				// }
+			// 				// this.from.virtual_name = res.virtual_name
+			// 			}
+			// 		}
+			// 	})
+			// },
 			resumeDetail() {
 				index().then(res => {
 					this.from.avatar = res.data.group_info.avatar //头像
 					this.from.name = res.data.group_info.name
 					this.from.sex = res.data.group_info.sex
+					this.from.virtual_name = res.data.group_info.virtual_name
 					this.from.birthday = res.data.group_info.birthday
 					// this.job_name = res.data.job_experience[0].job_name,
 					this.from.job_role = res.data.group_info.job_role //求职身份

+ 1 - 1
pagesD/preview.vue

@@ -30,7 +30,7 @@
 				</view>
 				<view class="mar">
 					<view type="text" placeholder="编辑优势亮点,展示我的独特态度" v-model="from.personal_advantage">
-						{{from.personal_advantage}}
+						{{from.personal_advantage||''}}
 					</view>
 				</view>
 			</view>

+ 51 - 12
pagesD/resume.vue

@@ -63,7 +63,6 @@
 			<view class="" style="border-top:2rpx solid #F0F0F0;margin-top: 32rpx;">
 				<view class="u-flex u-row-between">
 					<text class="title">工作经历</text>
-
 					<view style="margin-top:34rpx"><u-icon name="plus-circle" size="20" @click="towork(1)"></u-icon>
 					</view>
 				</view>
@@ -90,7 +89,6 @@ color: #333333;">
 			<view class="" style="margin-top: 40rpx;border-top: 2rpx solid #F0F0F0;">
 				<view class="u-flex u-row-between">
 					<text class="title">项目经历</text>
-
 					<view style="margin-top:34rpx"><u-icon name="plus-circle" size="20" @click="toproject(1)"></u-icon>
 					</view>
 				</view>
@@ -184,7 +182,7 @@ color: #333333;">
 			<view class="left" @click="jianlishow = true">
 				简历导入
 			</view>
-			<view class="right" @click="preview">
+			<view class="right" @click="preview1">
 				<text style="opacity: 1;color: #0C66C2;">预览</text>
 			</view>
 			<view class="safe-area-inset-bottom"></view>
@@ -203,7 +201,7 @@ color: #333333;">
 				</view>
 				<view class="" style="margin-top: 72rpx;">
 					<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
-						<view class="u-flex u-row-between" v-if="file_show==1">
+						<view class="u-flex u-row-between" v-if="file_show==1" @click="preview1">
 							<view class="u-flex">
 								<image style="width: 80rpx;height: 80rpx;" src="/static/images/pdf.png" mode=""></image>
 								<view class="">
@@ -219,13 +217,15 @@ color: #333333;">
 						<view class="updata u-flex u-row-center" @click="toupload">
 							上传新简历
 						</view>
-						<view @click="daoru" class="enter u-flex u-row-center">
+						<view @click="queren = true" class="enter u-flex u-row-center">
 							确定
 						</view>
 					</u-radio-group>
 				</view>
 			</view>
 		</u-popup>
+		<u-modal :closeOnClickOverlay='true' :showCancelButton='true' :show="queren" :title="title1" :content='content1'
+			@confirm='daoru' @cancel='queren=false'></u-modal>
 	</view>
 </template>
 
@@ -235,12 +235,17 @@ color: #333333;">
 		get_job_status,
 		update,
 		ocr,
-		upload
+		upload,
+		create
 	} from "@/units/inquire.js"
+	// import { log } from "console";
 	export default {
 		data() {
 			return {
+				title1: '提示',
+				content1: '是否使用此简历',
 				path: '',
+				queren: false,
 				file_show: 0,
 				i: 0,
 				jianlishow: false,
@@ -346,7 +351,7 @@ color: #333333;">
 				},
 				education_experience1: [], //教育经历
 				job_experience1: [], //工作经历
-				job_intention1: [], //教育经历
+				job_intention1: [], //求职意向
 				project_experience1: [], //项目经历
 				language1: [], //语言能力
 				joblist: [],
@@ -360,13 +365,26 @@ color: #333333;">
 			if (uni.getStorageSync('path1')) {
 				this.path1 = uni.getStorageSync('path1')
 			}
-			this.resumeDetail()
+
 		},
 		onShow() {
-			
+			this.resumeDetail()
 		},
 		methods: {
+			preview1() {
+				uni.openDocument({
+					filePath: this.path1,
+					showMenu: true,
+					success: function(res) {
+						console.log('打开文档成功');
+					},
+					fail: () => {
+						console.log('文件打开失败');
+					}
+				});
+			},
 			daoru() {
+				this.queren = false
 				if (this.file_show == 0) {
 					this.$u.toast('请先上传简历')
 				} else {
@@ -409,11 +427,27 @@ color: #333333;">
 				ocr({
 					path: this.path
 				}).then(res => {
+					this.from.birthday_text = res.data.data.resume.birthday
+					this.from.personal_advantage = res.data.data.resume.personal_advantage
+					this.from.education_name = res.data.data.resume.education_name
+					this.from.experience = res.data.data.resume.experience
+					this.from.name = res.data.data.resume.name
 					this.education_experience1 = res.data.data.education_experience //教育经历
 					this.job_experience1 = res.data.data.job_experience //工作经历
 					this.project_experience1 = res.data.data.project_experience //项目经历
-					console.log('jianli', res);
 					uni.hideLoading();
+					this.create()
+				})
+			},
+			create() {
+				create({
+					...this.from,
+					education_experience: this.education_experience1,
+					job_experience: this.job_experience1,
+					project_experience: this.project_experience1,
+					job_intention: this.job_intention1
+				}).then(res => {
+					this.resumeDetail()
 				})
 			},
 			touptate() {
@@ -464,6 +498,7 @@ color: #333333;">
 				})
 			},
 			toproject(type, id) {
+				console.log(id, 'lllllllllll');
 				uni.navigateTo({
 					url: "/pagesD/project?type=" + type + "&id=" + id
 				})
@@ -504,8 +539,8 @@ color: #333333;">
 				uni.navigateTo({
 					url: "/pagesD/apply?type=" + type + "&id=" + id,
 					events: {
-						apply: (res) => {
-							console.log(res);
+						refresh: (res) => {
+							// this.
 						}
 					}
 				})
@@ -707,4 +742,8 @@ color: #333333;">
 			background-color: rgba(12, 102, 194, 0.1);
 		}
 	}
+
+	::v-deep .u-popup__content {
+		border: 1rpx solid #888 !important;
+	}
 </style>

+ 6 - 3
pagesD/shezhi.vue

@@ -3,7 +3,8 @@
 		<view class="setting-box">
 			<view class="setting-row u-flex u-row-between" @click="tochangetel">
 				<text class="text">手机号</text>
-				<input class="input" type="text" placeholder="" :value="mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')" :disabled="true">
+				<input class="input" type="text" placeholder="设置手机号"
+					:value="mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')" :disabled="true">
 				<u-icon name="arrow-right" color="rgba(76, 76, 76, 0.6)"></u-icon>
 			</view>
 			<view class="setting-row u-flex u-row-between" @click="tochangepwd">
@@ -41,7 +42,9 @@
 </template>
 
 <script>
-	import {index} from "@/units/inquire.js"
+	import {
+		index
+	} from "@/units/inquire.js"
 	export default {
 		data() {
 			return {
@@ -78,7 +81,7 @@
 			},
 			tozhaohu() {
 				uni.navigateTo({
-					url: "/pagesD/zhaohu"
+					url: "/pagesC/changyong-list"
 				})
 			},
 			toxiaoxi() {

BIN
pagesD/static/images/wxpay.png


+ 5 - 4
pagesD/upload.vue

@@ -53,7 +53,7 @@
 				flielist: [],
 				index: "",
 				fill: "",
-				path1:''
+				path1: ''
 			}
 		},
 		onLoad(options) {
@@ -61,12 +61,13 @@
 		},
 		methods: {
 			touserinfo() {
+				console.log(this.path);
 				update({
 					source_type: "file",
 					file: this.path,
 					title: this.name.slice(0, -4)
 				}).then(res => {
-					uni.setStorageSync("path1",this.path1)
+					uni.setStorageSync("path1", this.path1)
 					const eventChannel = this.getOpenerEventChannel();
 					eventChannel.emit('up', this.path1);
 					uni.navigateBack()
@@ -80,7 +81,7 @@
 					success: function(res) {
 						console.log('打开文档成功');
 					},
-					fail:function(){
+					fail: function() {
 						console.log("打开文件失败");
 					}
 				});
@@ -116,9 +117,9 @@
 							icon: 'success',
 							duration: 1000
 						})
-						this.path = res.data.fullurl
 						var obj = JSON.parse(res.data)
 						this.flielist.push(obj.data.fullurl)
+						this.path = JSON.parse(res.data).data.fullurl
 					},
 					fail: (err) => {
 						console.log('uploadImage fail', err);

+ 24 - 29
pagesD/userinfo.vue

@@ -65,10 +65,10 @@
 				<view class="u-flex u-row-between">
 					<view style="width: 80rpx;" class="" @click="salarytype = true">{{salary_type}}</view>
 					<u-icon name="arrow-down-fill" color="#000" size="8"></u-icon>
-					<u--input border style='width:50rpx' class="" v-model="from.salary">{{from.salary||''}}</u--input>
-					<text>*</text>
+					<u--input border style='width:50rpx' class="" v-model="from.salary">{{from.salary||''}}</u--input>K
+					<text style="margin-left: 50rpx;">*</text>
 					<u--input border style='width:50rpx' class=""
-						v-model="from.salary_month">{{from.salary_month||''}}</u--input>个月
+						v-model="from.salary_month">{{from.salary_month||''}}</u--input>薪资
 				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
@@ -249,6 +249,7 @@ color: #0C66C2;">已绑定</text>
 				jianliid: "",
 				city2: '',
 				// typea: ''
+				virtual_name:'',
 			}
 		},
 		onLoad(option) {
@@ -311,41 +312,34 @@ color: #0C66C2;">已绑定</text>
 				})
 			},
 			tochangename() {
+				console.log('kkkk', {
+					name: this.from.name,
+					virtual_name: this.from.virtual_name
+				});
 				uni.navigateTo({
+
 					url: "/pagesD/change-name?name=" + JSON.stringify({
 						name: this.from.name,
+						virtual_name: this.from.virtual_name
 					}),
 					events: {
 						getname: (res) => {
-							console.log(res);
 							if (res.name) {
+								this.from.name = res.name
+							} else {
 								var name = ''
 								fuxing.forEach(val => {
-									if (res.name.indexOf(val) > -1) {
-										name = name[0] + res.name[1] + (this
-											.from.sex == 'female' ? '女士' : '先生')
-									}
-									if (!name) {
-										name = res.name[0] + (this.from.sex == 'female' ? '女士' : '先生')
+									if (res.virtual_name.indexOf(val) > -1) {
+										name = res.virtual_name[0] + res.virtual_name[1] + (this.from
+											.sex == 'female' ? '女士' : '先生')
 									}
 								})
-								console.log(name);
+								if (!name) {
+									name = res.virtual_name[0] + (this.from.sex == 'female' ? '女士' : '先生')
+								}
 								this.from.name = name
 							}
-							// else {
-							// 	var name = ''
-							// 	fuxing.forEach(val => {
-							// 		if (res.virtual_name.indexOf(val) > -1) {
-							// 			name = res.virtual_name[0] + res.virtual_name[1] + (this
-							// 				.from.sex == 'female' ? '女士' : '先生')
-							// 		}
-							// 	})
-							// 	if (!name) {
-							// 		name = res.virtual_name[0] + (this.from.sex == 'female' ? '女士' : '先生')
-							// 	}
-							// 	this.from.name = name
-							// }
-							// this.from.virtual_name = res.virtual_name
+							this.from.virtual_name = res.virtual_name
 						}
 					}
 				})
@@ -356,6 +350,7 @@ color: #0C66C2;">已绑定</text>
 					this.from.name = res.data.name
 					this.from.sex = res.data.sex
 					this.from.birthday = res.data.birthday
+					this.from.virtual_name = res.data.virtual_name
 					// this.job_name = res.data.job_experience[0].job_name,
 					this.from.job_role = res.data.job_role //求职身份
 					this.from.job_time = res.data.job_time //参加工作时间  
@@ -683,10 +678,10 @@ color: #0C66C2;">已绑定</text>
 						return
 					}
 				}
-				if (!this.from.wx) {
-					this.$u.toast("请填写微信号")
-					return
-				}
+				// if (!this.from.wx) {
+				// 	this.$u.toast("请填写微信号")
+				// 	return
+				// }
 				update({
 					source_id: this.jianliid,
 					...this.from

+ 2 - 1
pagesD/work.vue

@@ -58,7 +58,7 @@
 			<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写(选填)" border
 				placeholderClass='input-style' v-model="job_experience.report_to"></u--input>
 		</view>
-		<view class="u-flex u-row-between">
+		<view class="u-flex u-row-between" style="margin-bottom: 20rpx;">
 			<view class="button1" @click="dele" v-if="key==2">
 				删除
 			</view>
@@ -66,6 +66,7 @@
 				保存
 			</view>
 		</view>
+		<view class="safe-area-inset-bottom"></view>
 		<u-datetime-picker title="入职时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
 			@cancel='entryShow = false'></u-datetime-picker>
 		<u-datetime-picker title="离职时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="year-month"

+ 0 - 4
unpackage/dist/build/mp-weixin/app.js

@@ -1,4 +0,0 @@
-
-require('./common/runtime.js')
-require('./common/vendor.js')
-require('./common/main.js')

+ 0 - 148
unpackage/dist/build/mp-weixin/app.json

@@ -1,148 +0,0 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/login/login",
-    "pages/luntan/luntan",
-    "pages/xiaoxi/xiaoxi",
-    "pages/mine/mine",
-    "pages/zixun/zixun"
-  ],
-  "subPackages": [
-    {
-      "root": "pagesA",
-      "pages": [
-        "tel-login",
-        "jianlichange",
-        "yaoqing",
-        "userinfo",
-        "jianli",
-        "work",
-        "Project ",
-        "description",
-        "teach",
-        "expectation",
-        "xieyi",
-        "change-hangye1",
-        "change-hangye",
-        "change-zhiwei",
-        "index-search",
-        "upload",
-        "worktion"
-      ]
-    },
-    {
-      "root": "pagesB",
-      "pages": [
-        "details",
-        "gongsi-info",
-        "general",
-        "general-info",
-        "zixun-info"
-      ]
-    },
-    {
-      "root": "pagesC",
-      "pages": [
-        "luntan-info",
-        "my-luntan",
-        "quanzi-info",
-        "xiaoxi-list",
-        "add-luntan",
-        "add-luntan-over",
-        "add-quanzi",
-        "add-quanzi-over",
-        "changyong-add",
-        "changyong-list",
-        "chat"
-      ]
-    },
-    {
-      "root": "pagesD",
-      "pages": [
-        "userinfo",
-        "resume",
-        "my-fapiao",
-        "my-shoucang",
-        "look",
-        "shezhi",
-        "change-tel",
-        "change-pwd",
-        "xiaoxi",
-        "zhaohu",
-        "my-order",
-        "renzheng",
-        "order-info",
-        "apply",
-        "apply1",
-        "yongjin",
-        "tixian",
-        "bank-add",
-        "yinsi",
-        "setbank",
-        "bank-card",
-        "mingxi",
-        "tixian1",
-        "personal-infor",
-        "work",
-        "advantage",
-        "project",
-        "teach",
-        "language",
-        "certificate",
-        "skill",
-        "preview",
-        "zixun-info",
-        "change-name",
-        "dakuan",
-        "fujian",
-        "upload",
-        "change-jianli",
-        "dingdan/dingdan",
-        "invite-list",
-        "pay"
-      ]
-    }
-  ],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarBackgroundColor": "#fff",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "selectedColor": "#0C66C2",
-    "color": "#818389",
-    "list": [
-      {
-        "iconPath": "static/images/index.png",
-        "selectedIconPath": "static/images/index1.png",
-        "text": "职位",
-        "pagePath": "pages/index/index"
-      },
-      {
-        "iconPath": "static/images/luntan.png",
-        "selectedIconPath": "static/images/luntan1.png",
-        "text": "论坛",
-        "pagePath": "pages/luntan/luntan"
-      },
-      {
-        "iconPath": "static/images/zixun.png",
-        "selectedIconPath": "static/images/zixun1.png",
-        "text": "资讯",
-        "pagePath": "pages/zixun/zixun"
-      },
-      {
-        "iconPath": "static/images/xiaoxi.png",
-        "selectedIconPath": "static/images/xiaoxi1.png",
-        "text": "消息",
-        "pagePath": "pages/xiaoxi/xiaoxi"
-      },
-      {
-        "iconPath": "static/images/mine.png",
-        "selectedIconPath": "static/images/mine1.png",
-        "text": "我的",
-        "pagePath": "pages/mine/mine"
-      }
-    ]
-  },
-  "usingComponents": {}
-}

+ 0 - 3
unpackage/dist/build/mp-weixin/app.wxss

@@ -1,3 +0,0 @@
-@import './common/main.wxss';
-
-[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 2
unpackage/dist/build/mp-weixin/common/runtime.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.js


+ 0 - 7
unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-checkbox-group": "/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group",
-    "u-checkbox": "/node-modules/uview-ui/components/u-checkbox/u-checkbox"
-  }
-}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hx-invite/hx-invite.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hx-order/hx-order.js


+ 0 - 7
unpackage/dist/build/mp-weixin/components/hx-order/hx-order.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-checkbox-group": "/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group",
-    "u-checkbox": "/node-modules/uview-ui/components/u-checkbox/u-checkbox"
-  }
-}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hx-order/hx-order.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/hx-order/hx-order.wxss


+ 0 - 10
unpackage/dist/build/mp-weixin/components/hx-school/hx-school.js

@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/hx-school/hx-school"],{"42ce":function(t,e,i){"use strict";var n=i("c8b2"),a=i.n(n);a.a},6081:function(t,e,i){"use strict";i.r(e);var n=i("8ee2"),a=i("9bf8");for(var c in a)["default"].indexOf(c)<0&&function(t){i.d(e,t,(function(){return a[t]}))}(c);i("42ce");var o=i("f0c5"),s=Object(o["a"])(a["default"],n["b"],n["c"],!1,null,"09fba346",null,!1,n["a"],void 0);e["default"]=s.exports},"750b":function(t,e,i){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=i("2e9d"),a={onReachBottom:function(){this.activityget_list.length!=this.total&&(this.page++,this.activitygetlist())},data:function(){return{page:1,activityget_list:[]}},mounted:function(){console.log(111),this.activitygetlist()},props:{search:""},methods:{tishi:function(t){1==t?this.$u.toast("活动已过期"):this.$u.toast("活动未开始")},togeneral:function(e){t.navigateTo({url:"/pagesB/general?id="+e})},activitygetlist:function(){var t=this;console.log(111),(0,n.activityget_list)({page:this.page,search:this.search}).then((function(e){console.log(e),1==t.page?t.activityget_list=e.data.data:t.activityget_list=t.activityget_list.concat(e.data.data)}))}}};e.default=a}).call(this,i("543d")["default"])},"8ee2":function(t,e,i){"use strict";i.d(e,"b",(function(){return n})),i.d(e,"c",(function(){return a})),i.d(e,"a",(function(){}));var n=function(){var t=this,e=t.$createElement,i=(t._self._c,t.__map(t.activityget_list,(function(e,i){var n=t.__get_orig(e),a=e.start_time.replaceAll("-","."),c=e.end_time.replaceAll("-",".").slice(-5);return{$orig:n,g0:a,g1:c}})));t.$mp.data=Object.assign({},{$root:{l0:i}})},a=[]},"9bf8":function(t,e,i){"use strict";i.r(e);var n=i("750b"),a=i.n(n);for(var c in n)["default"].indexOf(c)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(c);e["default"]=a.a},c8b2:function(t,e,i){}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'components/hx-school/hx-school-create-component',
-    {
-        'components/hx-school/hx-school-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("6081"))
-        })
-    },
-    [['components/hx-school/hx-school-create-component']]
-]);

+ 0 - 4
unpackage/dist/build/mp-weixin/components/hx-school/hx-school.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/hx-school/hx-school.wxml

@@ -1 +0,0 @@
-<view class="data-v-09fba346"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="id"><view class="list data-v-09fba346"><view class="u-flex data-v-09fba346"><image style="width:92rpx;height:92rpx;" src="{{item.$orig.school.logo}}" mode class="data-v-09fba346"></image><view style="margin-left:20rpx;" class="data-v-09fba346"><text class="fontsty data-v-09fba346">{{item.$orig.school.name+item.$orig.title}}</text><view class="font data-v-09fba346"><text class="data-v-09fba346">活动时间:</text><text class="data-v-09fba346">{{item.g0+"-"+item.g1}}</text></view></view></view><view class="border u-row-between data-v-09fba346"><view class="data-v-09fba346"></view><block wx:if="{{item.$orig.status==2}}"><view data-event-opts="{{[['tap',[['togeneral',['$0'],[[['activityget_list','id',item.$orig.id,'id']]]]]]]}}" class="btn data-v-09fba346" bindtap="__e">查看活动</view></block><block wx:if="{{item.$orig.status==3}}"><view data-event-opts="{{[['tap',[['tishi',[1]]]]]}}" class="btn data-v-09fba346" style="background:#d3d3d3;" bindtap="__e">查看活动</view></block><block wx:if="{{item.$orig.status==1}}"><view data-event-opts="{{[['tap',[['tishi',[2]]]]]}}" class="btn data-v-09fba346" style="background:#d3d3d3;" bindtap="__e">查看活动</view></block></view></view></block></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/components/hx-school/hx-school.wxss

@@ -1 +0,0 @@
-.list.data-v-09fba346{padding:32rpx 20rpx 24rpx 28rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;box-sizing:border-box}.list .fontsty.data-v-09fba346{font-size:32rpx;font-family:SFPro-Medium,SFPro;font-weight:500;color:#222}.list .font.data-v-09fba346{font-size:24rpx;font-family:SFPro-Regular,SFPro;font-weight:400;color:#555;margin-top:14rpx}.list .border.data-v-09fba346{margin-top:28rpx;border-top:2rpx solid #f3f3f3;display:flex}.list .btn.data-v-09fba346{width:164rpx;height:68rpx;line-height:68rpx;margin-top:22rpx;background:#0c66c2;border-radius:10rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#fff;margin-right:0!important;text-align:center}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.js


+ 0 - 6
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "xinyu-cross-canvas": "/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.wxml

@@ -1 +0,0 @@
-<view class="CANVAS_DRAWER data-v-cb8634ba"><xinyu-cross-canvas vue-id="b8ba6d88-1" width="{{widthTemp}}" height="{{heightTemp}}" styleWidth="{{widthTemp}}" styleHeight="{{heightTemp}}" id="CANVAS_DRAWER_TEMP" data-ref="CANVAS_DRAWER_TEMP" data-event-opts="{{[['^updateWidth',[['__set_sync',['$0','widthTemp','$event'],['']]]],['^updateHeight',[['__set_sync',['$0','heightTemp','$event'],['']]]]]}}" bind:updateWidth="__e" bind:updateHeight="__e" class="data-v-cb8634ba vue-ref" bind:__l="__l"></xinyu-cross-canvas><xinyu-cross-canvas vue-id="b8ba6d88-2" width="{{width}}" height="{{height}}" styleWidth="{{width}}" styleHeight="{{height}}" id="CANVAS_DRAWER" data-ref="CANVAS_DRAWER" data-event-opts="{{[['^updateWidth',[['__set_sync',['$0','width','$event'],['']]]],['^updateHeight',[['__set_sync',['$0','height','$event'],['']]]]]}}" bind:updateWidth="__e" bind:updateHeight="__e" class="data-v-cb8634ba vue-ref" bind:__l="__l"></xinyu-cross-canvas></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/index.wxss

@@ -1 +0,0 @@
-.CANVAS_DRAWER.data-v-cb8634ba{position:fixed;left:750rpx;top:0rpx}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas.js


+ 0 - 4
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/xinyu-canvas-drawer/xinyu-cross-canvas/xinyu-cross-canvas.wxml

@@ -1 +0,0 @@
-<view><view style="{{'width:'+(styleWidth==-1?$root.m0:$root.m1)+';'+('height:'+(styleHeight==-1?'100vh':$root.m2)+';')}}"><canvas style="{{'width:'+(styleWidth==-1?$root.m3:$root.m4)+';'+('height:'+(styleHeight==-1?'100vh':$root.m5)+';')}}" type="2d" disable-scroll="{{true}}" id="{{id}}" data-event-opts="{{[['touchstart',[['onTouch',['start','$event']]]],['touchmove',[['onTouch',['move','$event']]]],['touchend',[['onTouch',['end','$event']]]]]}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e"></canvas></view></view>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.js


+ 0 - 4
unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zhao-chat/zhao-chat.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.js


+ 0 - 9
unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.json

@@ -1,9 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-popup": "/node-modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
-    "u-modal": "/node-modules/uview-ui/components/u-modal/u-modal",
-    "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker"
-  }
-}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zhao-shaixuan/zhao-shaixuan.wxss


+ 0 - 10
unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.js

@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/zhao-text/zhao-text"],{"12c3":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{text:{type:String,default:""}},data:function(){return{showmore:!1,show:!1}},created:function(){},mounted:function(){var n=this,e=t.createSelectorQuery().in(this);e.select("#text").boundingClientRect((function(t){t.height>110&&(n.showmore=!0),n.show=!0})).exec()},methods:{}};n.default=e}).call(this,e("543d")["default"])},"5e1d":function(t,n,e){},a6b1:function(t,n,e){"use strict";e.r(n);var o=e("dbbd"),u=e("caa3");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("b03d");var a=e("f0c5"),i=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],void 0);n["default"]=i.exports},b03d:function(t,n,e){"use strict";var o=e("5e1d"),u=e.n(o);u.a},caa3:function(t,n,e){"use strict";e.r(n);var o=e("12c3"),u=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);n["default"]=u.a},dbbd:function(t,n,e){"use strict";e.d(n,"b",(function(){return o})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var o=function(){var t=this,n=t.$createElement;t._self._c;t._isMounted||(t.e0=function(n){n.stopPropagation(),t.showmore=!1})},u=[]}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'components/zhao-text/zhao-text-create-component',
-    {
-        'components/zhao-text/zhao-text-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("a6b1"))
-        })
-    },
-    [['components/zhao-text/zhao-text-create-component']]
-]);

+ 0 - 4
unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.wxml

@@ -1 +0,0 @@
-<view class="zhao-text"><view class="position-text" id="text">{{''+text+''}}</view><block wx:if="{{show}}"><view class="{{['text',(showmore)?'line5':'']}}">{{''+text+''}}</view></block><block wx:if="{{showmore}}"><view class="text-more"><text>...</text><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" catchtap="__e">全文</text></view></block></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/components/zhao-text/zhao-text.wxss

@@ -1 +0,0 @@
-.zhao-text{position:relative;overflow:hidden}.zhao-text .position-text{position:absolute;z-index:-100;font-size:15px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#333;line-height:21px;text-align:justify;width:100%}.zhao-text .text-more{position:absolute;bottom:0;right:0;line-height:21px;font-size:15px;background-color:#fff}.zhao-text .text-more text:first-child{color:#333;letter-spacing:2rpx}.zhao-text .text-more text:last-child{color:#0c66c2;margin-left:2rpx}.zhao-text .line5{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:5;overflow:hidden}.zhao-text .text{font-size:15px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#333;line-height:21px;text-align:justify}

+ 0 - 10
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js

@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--input/u--input"],{2603:function(n,e,u){"use strict";u.r(e);var t=u("c08e"),i=u("f003");for(var o in i)["default"].indexOf(o)<0&&function(n){u.d(e,n,(function(){return i[n]}))}(o);var r=u("f0c5"),c=Object(r["a"])(i["default"],t["b"],t["c"],!1,null,null,null,!1,t["a"],void 0);e["default"]=c.exports},"9657a":function(n,e,u){"use strict";(function(n){var t=u("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=t(u("f963")),o={name:"u--input",mixins:[n.$u.mpMixin,i.default,n.$u.mixin],components:{uvInput:function(){Promise.all([u.e("common/vendor"),u.e("node-modules/uview-ui/components/u-input/u-input")]).then(function(){return resolve(u("9a5e"))}.bind(null,u)).catch(u.oe)}}};e.default=o}).call(this,u("543d")["default"])},c08e:function(n,e,u){"use strict";u.d(e,"b",(function(){return t})),u.d(e,"c",(function(){return i})),u.d(e,"a",(function(){}));var t=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=[]},f003:function(n,e,u){"use strict";u.r(e);var t=u("9657a"),i=u.n(t);for(var o in t)["default"].indexOf(o)<0&&function(n){u.d(e,n,(function(){return t[n]}))}(o);e["default"]=i.a}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'node-modules/uview-ui/components/u--input/u--input-create-component',
-    {
-        'node-modules/uview-ui/components/u--input/u--input-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("2603"))
-        })
-    },
-    [['node-modules/uview-ui/components/u--input/u--input-create-component']]
-]);

+ 0 - 6
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--input/u--input.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uv-input": "/node-modules/uview-ui/components/u-input/u-input"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--input/u--input.wxml

@@ -1 +0,0 @@
-<uv-input vue-id="3215cba6-1" value="{{value}}" type="{{type}}" fixed="{{fixed}}" disabled="{{disabled}}" disabledColor="{{disabledColor}}" clearable="{{clearable}}" password="{{password}}" maxlength="{{maxlength}}" placeholder="{{placeholder}}" placeholderClass="{{placeholderClass}}" placeholderStyle="{{placeholderStyle}}" showWordLimit="{{showWordLimit}}" confirmType="{{confirmType}}" confirmHold="{{confirmHold}}" holdKeyboard="{{holdKeyboard}}" focus="{{focus}}" autoBlur="{{autoBlur}}" disableDefaultPadding="{{disableDefaultPadding}}" cursor="{{cursor}}" cursorSpacing="{{cursorSpacing}}" selectionStart="{{selectionStart}}" selectionEnd="{{selectionEnd}}" adjustPosition="{{adjustPosition}}" inputAlign="{{inputAlign}}" fontSize="{{fontSize}}" color="{{color}}" prefixIcon="{{prefixIcon}}" suffixIcon="{{suffixIcon}}" suffixIconStyle="{{suffixIconStyle}}" prefixIconStyle="{{prefixIconStyle}}" border="{{border}}" readonly="{{readonly}}" shape="{{shape}}" customStyle="{{customStyle}}" formatter="{{formatter}}" ignoreCompositionEvent="{{ignoreCompositionEvent}}" data-event-opts="{{[['^focus',[['$emit',['focus']]]],['^blur',[['e0']]],['^keyboardheightchange',[['$emit',['keyboardheightchange']]]],['^change',[['e1']]],['^input',[['e2']]],['^confirm',[['e3']]],['^clear',[['$emit',['clear']]]],['^click',[['$emit',['click']]]]]}}" bind:focus="__e" bind:blur="__e" bind:keyboardheightchange="__e" bind:change="__e" bind:input="__e" bind:confirm="__e" bind:clear="__e" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"><slot name="prefix"></slot><slot name="suffix"></slot></uv-input>

+ 0 - 10
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js

@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u--text/u--text"],{"344c":function(e,n,t){"use strict";(function(e){var u=t("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=u(t("ba2f")),i={name:"u--text",mixins:[e.$u.mpMixin,o.default,e.$u.mixin],components:{uvText:function(){Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-text/u-text")]).then(function(){return resolve(t("a90b"))}.bind(null,t)).catch(t.oe)}}};n.default=i}).call(this,t("543d")["default"])},a50b:function(e,n,t){"use strict";t.r(n);var u=t("ce42"),o=t("e64d");for(var i in o)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(i);var c=t("f0c5"),a=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);n["default"]=a.exports},ce42:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},o=[]},e64d:function(e,n,t){"use strict";t.r(n);var u=t("344c"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);n["default"]=o.a}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'node-modules/uview-ui/components/u--text/u--text-create-component',
-    {
-        'node-modules/uview-ui/components/u--text/u--text-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("a50b"))
-        })
-    },
-    [['node-modules/uview-ui/components/u--text/u--text-create-component']]
-]);

+ 0 - 6
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--text/u--text.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uv-text": "/node-modules/uview-ui/components/u-text/u-text"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u--text/u--text.wxml

@@ -1 +0,0 @@
-<uv-text vue-id="48c60447-1" type="{{type}}" show="{{show}}" text="{{text}}" prefixIcon="{{prefixIcon}}" suffixIcon="{{suffixIcon}}" mode="{{mode}}" href="{{href}}" format="{{format}}" call="{{call}}" openType="{{openType}}" bold="{{bold}}" block="{{block}}" lines="{{lines}}" color="{{color}}" decoration="{{decoration}}" size="{{size}}" iconStyle="{{iconStyle}}" margin="{{margin}}" lineHeight="{{lineHeight}}" align="{{align}}" wordWrap="{{wordWrap}}" customStyle="{{customStyle}}" data-event-opts="{{[['^click',[['$emit',['click']]]]]}}" bind:click="__e" bind:__l="__l"></uv-text>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js


+ 0 - 4
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.wxml

@@ -1 +0,0 @@
-<block wx:if="{{$root.m0}}"><text class="{{['u-badge','data-v-231d324e',isDot?'u-badge--dot':'u-badge--not-dot',inverted&&'u-badge--inverted',shape==='horn'&&'u-badge--horn','u-badge--'+type+(inverted?'--inverted':'')]}}" style="{{$root.s0}}">{{isDot?'':showValue}}</text></block>

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.wxss

@@ -1 +0,0 @@
-view.data-v-231d324e, scroll-view.data-v-231d324e, swiper-item.data-v-231d324e{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-badge.data-v-231d324e{border-top-right-radius:100px;border-top-left-radius:100px;border-bottom-left-radius:100px;border-bottom-right-radius:100px;display:flex;flex-direction:row;line-height:11px;text-align:center;font-size:11px;color:#fff}.u-badge--dot.data-v-231d324e{height:8px;width:8px}.u-badge--inverted.data-v-231d324e{font-size:13px}.u-badge--not-dot.data-v-231d324e{padding:2px 5px}.u-badge--horn.data-v-231d324e{border-bottom-left-radius:0}.u-badge--primary.data-v-231d324e{background-color:#3c9cff}.u-badge--primary--inverted.data-v-231d324e{color:#3c9cff}.u-badge--error.data-v-231d324e{background-color:#f56c6c}.u-badge--error--inverted.data-v-231d324e{color:#f56c6c}.u-badge--success.data-v-231d324e{background-color:#5ac725}.u-badge--success--inverted.data-v-231d324e{color:#5ac725}.u-badge--info.data-v-231d324e{background-color:#909399}.u-badge--info--inverted.data-v-231d324e{color:#909399}.u-badge--warning.data-v-231d324e{background-color:#f9ae3d}.u-badge--warning--inverted.data-v-231d324e{color:#f9ae3d}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js


+ 0 - 7
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
-    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxml

@@ -1 +0,0 @@
-<button class="{{['u-button','u-reset-button','data-v-18373a4f',bemClass]}}" style="{{$root.s0}}" hover-start-time="{{$root.m0}}" hover-stay-time="{{$root.m1}}" form-type="{{formType}}" open-type="{{openType}}" app-parameter="{{appParameter}}" hover-stop-propagation="{{hoverStopPropagation}}" send-message-title="{{sendMessageTitle}}" send-message-path="{{sendMessagePath}}" lang="{{lang}}" data-name="{{dataName}}" session-from="{{sessionFrom}}" send-message-img="{{sendMessageImg}}" show-message-card="{{showMessageCard}}" hover-class="{{!disabled&&!loading?'u-button--active':''}}" data-event-opts="{{[['getphonenumber',[['getphonenumber',['$event']]]],['getuserinfo',[['getuserinfo',['$event']]]],['error',[['error',['$event']]]],['opensetting',[['opensetting',['$event']]]],['launchapp',[['launchapp',['$event']]]],['tap',[['clickHandler',['$event']]]]]}}" bindgetphonenumber="__e" bindgetuserinfo="__e" binderror="__e" bindopensetting="__e" bindlaunchapp="__e" bindtap="__e"><block wx:if="{{loading}}"><u-loading-icon vue-id="113d4a8d-1" mode="{{loadingMode}}" size="{{loadingSize*1.15}}" color="{{loadingColor}}" class="data-v-18373a4f" bind:__l="__l"></u-loading-icon><text class="u-button__loading-text data-v-18373a4f" style="{{'font-size:'+(textSize+'px')+';'}}">{{loadingText||text}}</text></block><block wx:else><block wx:if="{{icon}}"><u-icon vue-id="113d4a8d-2" name="{{icon}}" color="{{iconColorCom}}" size="{{textSize*1.35}}" customStyle="{{({marginRight:'2px'})}}" class="data-v-18373a4f" bind:__l="__l"></u-icon></block><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><text class="u-button__text data-v-18373a4f" style="{{'font-size:'+(textSize+'px')+';'}}">{{text}}</text></block></block></button>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxss


+ 0 - 10
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.js

@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group"],{"111b":function(t,n,e){"use strict";e.r(n);var i=e("2845"),u=e("73c8");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("b329");var a=e("f0c5"),o=Object(a["a"])(u["default"],i["b"],i["c"],!1,null,"5907e1fa",null,!1,i["a"],void 0);n["default"]=o.exports},2845:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},u=[]},"73c8":function(t,n,e){"use strict";e.r(n);var i=e("a8e7"),u=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=u.a},"9fa6":function(t,n,e){},a8e7:function(t,n,e){"use strict";(function(t){var i=e("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=i(e("285e")),c={name:"u-checkbox-group",mixins:[t.$u.mpMixin,t.$u.mixin,u.default],computed:{parentData:function(){return[this.value,this.disabled,this.inactiveColor,this.activeColor,this.size,this.labelDisabled,this.shape,this.iconSize,this.borderBottom,this.placement]},bemClass:function(){return this.bem("checkbox-group",["placement"])}},watch:{parentData:function(){this.children.length&&this.children.map((function(t){"function"===typeof t.init&&t.init()}))}},data:function(){return{}},created:function(){this.children=[]},methods:{unCheckedOther:function(t){var n=[];this.children.map((function(t){t.isChecked&&n.push(t.name)})),this.$emit("change",n),this.$emit("input",n)}}};n.default=c}).call(this,e("543d")["default"])},b329:function(t,n,e){"use strict";var i=e("9fa6"),u=e.n(i);u.a}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group-create-component',
-    {
-        'node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("111b"))
-        })
-    },
-    [['node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group-create-component']]
-]);

+ 0 - 4
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.wxml

@@ -1 +0,0 @@
-<view class="{{['u-checkbox-group','data-v-5907e1fa',bemClass]}}"><slot></slot></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.wxss

@@ -1 +0,0 @@
-view.data-v-5907e1fa, scroll-view.data-v-5907e1fa, swiper-item.data-v-5907e1fa{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-checkbox-group--row.data-v-5907e1fa{display:flex;flex-direction:row}.u-checkbox-group--column.data-v-5907e1fa{display:flex;flex-direction:column}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.js


+ 0 - 6
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.wxml

@@ -1 +0,0 @@
-<view data-event-opts="{{[['tap',[['wrapperClickHandler',['$event']]]]]}}" class="{{['u-checkbox','data-v-ef1d2b94','u-checkbox-label--'+parentData.iconPlacement,parentData.borderBottom&&parentData.placement==='column'&&'u-border-bottom']}}" style="{{$root.s0}}" catchtap="__e"><view data-event-opts="{{[['tap',[['iconClickHandler',['$event']]]]]}}" class="{{['u-checkbox__icon-wrap','data-v-ef1d2b94',iconClasses]}}" style="{{$root.s1}}" catchtap="__e"><block wx:if="{{$slots.icon}}"><slot name="icon"></slot></block><block wx:else><u-icon class="u-checkbox__icon-wrap__icon data-v-ef1d2b94" vue-id="0009dd26-1" name="checkbox-mark" size="{{elIconSize}}" color="{{elIconColor}}" bind:__l="__l"></u-icon></block></view><text data-event-opts="{{[['tap',[['labelClickHandler',['$event']]]]]}}" style="{{'color:'+(elDisabled?elInactiveColor:elLabelColor)+';'+('font-size:'+(elLabelSize)+';')+('line-height:'+(elLabelSize)+';')}}" catchtap="__e" class="data-v-ef1d2b94">{{label}}</text></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.wxss

@@ -1 +0,0 @@
-view.data-v-ef1d2b94, scroll-view.data-v-ef1d2b94, swiper-item.data-v-ef1d2b94{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-checkbox.data-v-ef1d2b94{display:flex;flex-direction:row;overflow:hidden;flex-direction:row;align-items:center}.u-checkbox-label--left.data-v-ef1d2b94{flex-direction:row}.u-checkbox-label--right.data-v-ef1d2b94{flex-direction:row-reverse;justify-content:space-between}.u-checkbox__icon-wrap.data-v-ef1d2b94{box-sizing:border-box;transition-property:border-color,background-color,color;transition-duration:.2s;color:#606266;display:flex;flex-direction:row;align-items:center;justify-content:center;color:transparent;text-align:center;margin-right:6px;font-size:6px;border-width:1px;border-color:#c8c9cc;border-style:solid}.u-checkbox__icon-wrap--circle.data-v-ef1d2b94{border-radius:100%}.u-checkbox__icon-wrap--square.data-v-ef1d2b94{border-radius:3px}.u-checkbox__icon-wrap--checked.data-v-ef1d2b94{color:#fff;background-color:red;border-color:#2979ff}.u-checkbox__icon-wrap--disabled.data-v-ef1d2b94{background-color:#ebedf0!important}.u-checkbox__icon-wrap--disabled--checked.data-v-ef1d2b94{color:#c8c9cc!important}.u-checkbox__label.data-v-ef1d2b94{word-wrap:break-word;margin-left:5px;margin-right:12px;color:#606266;font-size:15px}.u-checkbox__label--disabled.data-v-ef1d2b94{color:#c8c9cc}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.js


+ 0 - 4
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.wxml

@@ -1 +0,0 @@
-<view class="u-code data-v-75cd6d19"></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-code/u-code.wxss

@@ -1 +0,0 @@
-view.data-v-75cd6d19, scroll-view.data-v-75cd6d19, swiper-item.data-v-75cd6d19{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js


+ 0 - 6
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml

@@ -1 +0,0 @@
-<u-picker vue-id="01eaed7b-1" show="{{show}}" closeOnClickOverlay="{{closeOnClickOverlay}}" columns="{{columns}}" title="{{title}}" itemHeight="{{itemHeight}}" showToolbar="{{showToolbar}}" visibleItemCount="{{visibleItemCount}}" defaultIndex="{{innerDefaultIndex}}" cancelText="{{cancelText}}" confirmText="{{confirmText}}" cancelColor="{{cancelColor}}" confirmColor="{{confirmColor}}" data-ref="picker" data-event-opts="{{[['^close',[['close']]],['^cancel',[['cancel']]],['^confirm',[['confirm']]],['^change',[['change']]]]}}" bind:close="__e" bind:cancel="__e" bind:confirm="__e" bind:change="__e" class="data-v-e63c31da vue-ref" bind:__l="__l"></u-picker>

+ 0 - 1
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss

@@ -1 +0,0 @@
-view.data-v-e63c31da, scroll-view.data-v-e63c31da, swiper-item.data-v-e63c31da{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js


Неке датотеке нису приказане због велике количине промена