Merge remote-tracking branch 'origin/dev' into dev

tjty-app/api/activity.js

@@ -78,12 +78,3 @@ export function addUnifiedOrder(orderVo) {
   })
 }
 
-
-//微信支付回调下
-export function addUnifiedOrderWx(orderVo) {
-  return request({
-    url: 'http://bin001.free.idcfengye.com/dealFlow/stream/wxPayNotify',
-    method: 'post',
-    data: orderVo
-  })
-}
\ No newline at end of file

tjty-app/pages_activity/activity_detail/activity_detail.vue

@@ -128,10 +128,9 @@
      console.log(this.activityId)
      this.getList(this.activityId)
     },
-    // onShow() {
-    //   console.log('onShow')
-    //   this.getList(this.activityId)
-    // },
+    onShow() {
+      this.getList(this.activityId)
+    },
     filters: {
            ellipsis(value){
                 if (!value) return '';

tjty-app/pages_activity/activity_immedSignIn/activity_immedSignIn.vue

@@ -26,7 +26,7 @@
         	<uni-easyinput :inputBorder="false" v-model="info.idCard" placeholder="请输入证件号" :clearable="false">
         	</uni-easyinput>
         </uni-forms-item>
-		<uni-forms-item label="活动分类" required name="projectId">
+		<uni-forms-item label="项目分类" required name="projectId">
 					<picker @change="projectPickerChange" :value="projectIndex" :range="projectList" range-key="projectName"
 						:disabled="projectDisable" @cancel="projectCancel">
 						<view v-if="projectIndex ===projectList.length" class="uni-input">请选择项目
@@ -244,7 +244,7 @@ import {
             this.info.status = '0'
             addsignInInfo(this.info).then(response=>{
               console.log(response)   //存在的话就返回报错
-              if(response.data.code === 500)
+              if(response.code === 500)
               return uni.$showMsg(response.msg)
               this.orderVo.signupId = response.data.signupId
               this.orderVo.wechatId = this.info.wechatId

tjty-app/pages_events/tjty_ans_detail/tjty_ans_info.vue

@@ -140,7 +140,7 @@
 							errorMessage: '请输入姓名',
 						}, {
 							validateFunction: function(rule, value, data, callback) {
-								let nameReg = /^[A-z]{2,16}$|^[\u4E00-\u9FA5]{2,16}$/
+								let nameReg = /^[A-z | \u4E00-\u9FA5]{2,16}$/
 								if (!nameReg.test(value)) {
 									callback('姓名只能输入汉字或字母且长度为2-16')
 								}
@@ -154,7 +154,7 @@
 							errorMessage: '请输入姓名',
 						}, {
 							validateFunction: function(rule, value, data, callback) {
-								let nameReg = /^[A-z]{2,16}$|^[\u4E00-\u9FA5]{2,16}$/
+								let nameReg = /^[A-Za-z | \u4E00-\u9FA5]{2,16}$/
 								if (!nameReg.test(value)) {
 									callback('姓名只能输入汉字或字母且长度为2-16')
 								}

tjty-app/pages_feedback/tjty_feedback/tjty_feedback.vue

@@ -101,7 +101,8 @@
 				},
 				// 活动需要的作品形式（1--图片， 2--视频）
 				fileType: '1',
-				url: 'https://www.aiwanyundong.com/api/system/feedback/addFeedbackPicture',
+				// url: 'https://www.aiwanyundong.com/api/system/feedback/addFeedbackPicture',
+				url: 'https://www.aiwanyundong.com//stage-api/system/feedback/addFeedbackPicture',
 				// token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVmYzA4YjI4LTAwZGMtNGZkNy05NjRkLTU1YzgwOWMzNzAyOSJ9.sfi8a3ac3be7lXQAwbLmQQeYEnCBkUt0VzDFj0Q2VrdJPaQplA3ZocpH07jgTExdhMzWIlX6SuBJ1HazBxg4SQ',
 				clearIcon: '../../static/upload-img-icons/conteng_icon_del.png',
 				selectfile: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIuMjUiIHk9Ii4yNSIgd2lkdGg9IjYzLjUiIGhlaWdodD0iNjMuNSIgcng9IjMuNzUiIGZpbGw9IiNGMkYyRjIiIHN0cm9rZT0iI0YyRjJGMiIgc3Ryb2tlLXdpZHRoPSIuNSIvPjxyZWN0IHg9IjE2IiB5PSIzMSIgd2lkdGg9IjMyIiBoZWlnaHQ9IjIiIHJ4PSIxIiBmaWxsPSIjQkZCRkJGIi8+PHJlY3QgeD0iMzMiIHk9IjE2IiB3aWR0aD0iMzIiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKDkwIDMzIDE2KSIgZmlsbD0iI0JGQkZCRiIvPjwvc3ZnPg==',

tjty-app/pages_home/tjty_home_page/tjty_home_page.vue

@@ -387,7 +387,6 @@
 					}
 
 					.c-card {
-
 						font-size: 32rpx;
 						width: 500rpx;
 						height: 80rpx;

tjty-app/pages_my/my_faceback/my_faceback.vue

@@ -72,6 +72,10 @@
 		width: 100%;
 		height: auto;
 		background: #f5f5f5;
+		overflow-x: hidden;
+		overflow-y: hidden;
+		position: relative;
+		padding-bottom: 38rpx;
 	}	
 	.face_card{
 	margin:3% 5% 0 5%;

tjty-app/pages_new_media/tity_message_consult/tity_message_consult.vue

@@ -5,12 +5,12 @@
 				<uni-forms ref="form" :modelValue="personnel" label-position="top">
 					<uni-forms-item name="consultContent">
 						<uni-easyinput type="textarea" :inputBorder="false" v-model="personnel.consultContent"
-							placeholder="请输入留言内容" :trim="both" @focus="contentFlag = false" />
+							placeholder="请输入留言内容" :trim="both" @focus="contentFlag = false" maxlength="140" />
 						<view v-if="contentFlag" class="contentVerify">内容不能为空格或回车</view>
 					</uni-forms-item>
 					<uni-forms-item label="姓名" :required="true" name="nickName">
-						<uni-easyinput :inputBorder="false" type="text" v-model="personnel.nickName"
-							maxlength="10" placeholder="请输入姓名" />
+						<uni-easyinput :inputBorder="false" type="text" v-model="personnel.nickName" maxlength="16"
+							placeholder="请输入姓名" />
 					</uni-forms-item>
 					<uni-forms-item label="手机号" :required="true" name="phone">
 						<uni-easyinput :inputBorder="false" type="text" v-model="personnel.phone" maxlength="11"
@@ -54,7 +54,7 @@
 				contentFlag: false,
 				url: '',
 				personnel: {
-					consultType:'',
+					consultType: '',
 					consultContent: '',
 					nickName: '',
 					phone: '',
@@ -88,12 +88,13 @@
 							{
 								validateFunction: function(rule, value, data, callback) {
 									console.log("姓名--》", value)
-								
-									let nameReg =/^[\u4E00-\u9FA5]{2,16}$|^[a-zA-Z]{2,16}$/
-									// let nameReg2 =//
+									// 只能输入字母或者汉字，二选一
+									// let nameReg =/^[\u4E00-\u9FA5]{2,16}$|^[a-zA-Z]{2,16}$/
+									// 只能输入字母或者汉字，字母和汉字可以混一起
+									let nameReg = /^[a-zA-Z \u4E00-\u9FA5]{2,16}$/
 									if (!nameReg.test(value)) {
 										callback('姓名只能输入汉字或者大小写字母，请重新填写')
-										
+
 									}
 									return true
 								}

tjty-app/pages_new_media/tity_upload_port/tity_upload_port.vue

@@ -116,7 +116,8 @@
 
 				// 活动需要的作品形式（1--图片， 2--视频）
 				fileType: '1',
-				url: 'https://www.aiwanyundong.com/api/tjt-activity/picture/addPicture',
+				// url: 'https://www.aiwanyundong.com/api/tjt-activity/picture/addPicture',
+				url: 'https://www.aiwanyundong.com/stage-api/tjt-activity/picture/addPicture',
 				clearIcon: '../../static/upload-img-icons/conteng_icon_del.png',
 				selectfile: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIuMjUiIHk9Ii4yNSIgd2lkdGg9IjYzLjUiIGhlaWdodD0iNjMuNSIgcng9IjMuNzUiIGZpbGw9IiNGMkYyRjIiIHN0cm9rZT0iI0YyRjJGMiIgc3Ryb2tlLXdpZHRoPSIuNSIvPjxyZWN0IHg9IjE2IiB5PSIzMSIgd2lkdGg9IjMyIiBoZWlnaHQ9IjIiIHJ4PSIxIiBmaWxsPSIjQkZCRkJGIi8+PHJlY3QgeD0iMzMiIHk9IjE2IiB3aWR0aD0iMzIiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKDkwIDMzIDE2KSIgZmlsbD0iI0JGQkZCRiIvPjwvc3ZnPg==',
 				VideoOfImagesShow: true, // 页面图片或视频数量超出后，拍照按钮隐藏

tjty-app/utils/request.js

 import store from '@/store/store.js'
 
-
-
 // 获取当前帐号信息
 const accountInfo = wx.getAccountInfoSync();