活动

杨鑫
1 parent be8e7fa9
Showing 6 changed files with 22 additions and 18 deletions
admin-web-master/src/utils/request.js
admin-web-master/src/views/serve/actSp.vue
lvdao-miniapp/pages/activityDetail/activityDetail.vue
lvdao-miniapp/utils/request.js
merchant-web-master/src/utils/request.js
merchant-web-master/src/views/system/shopSys/index.vue
@@ -16,8 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
-  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
@@ -468,7 +468,7 @@ this.total = res.data.content.length
 		this.actPage.pageNumber = 0
 	    const res = await Registration(this.actPage)
 	    this.mingList = res.data.content
-	    this.mingtotal = res.totalElements
+	    this.mingtotal = res.data.totalElements
 	    this.baoming = true
@@ -477,7 +477,8 @@ this.total = res.data.content.length
 		  this.actPage.pageNumber = val
 		  const res = await Registration(this.actPage)
 		  this.mingList = res.data.content
-		  this.mingtotal = res.totalElements
+		  this.mingtotal = res.data.totalElements
+		  
 	  }
     }
   }
@@ -130,9 +130,11 @@ export default {
 	  		});
 	  		return 
 	  	}
+		// const dateString = this.getCurrentDateTime()
+		// 	this.form.signUpTime = new Date(dateString)
 		this.form.activityApplicationId = this.tableData.id
 	  	this.form.signUpTime = this.getCurrentDateTime()
-	  	this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,3).then(res => {
+	  	this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,1).then(res => {
 			console.log('res',res.data)
 			if(res.data.code == '200'){
 			setTimeout(()=>{
@@ -177,6 +179,7 @@ export default {
 		  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 		},
+		
   }
 };
 </script>
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-// let c1 = 'https://jy.scjysm.asia:18086/'
-let c1 = 'https://zhgw-uat.028wlkj.com/'
+let c1 = 'https://jy.scjysm.asia:18086/'
+// let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
@@ -19,8 +19,8 @@ let PREFIX;
  if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
   // 其他情况的默认值
   // PREFIX = 'http://8.130.38.56:8027/business-server';
-  PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
-  // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
+  // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
+  PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
   // PREFIX = 'http://128.10.249.8:9004';
 }else{
   // PREFIX = '/merchant-business';
@@ -66,7 +66,7 @@
               type="textarea"
             />
           </el-form-item>
-          <el-form-item label="注册手机号" prop="shopPhone">
+          <!-- <el-form-item label="注册手机号" prop="shopPhone">
             <el-input
               v-if="shopPhoneShow"
               :value="hidden(storeDetails.shopPhone,3,4)"
@@ -79,7 +79,7 @@
               v-model="storeDetails.shopPhone"
               :disabled="disabled1"
             />
-          </el-form-item>
+          </el-form-item> -->
         </div>
         <div class="h5">
           <!-- <div class="title">店铺认证</div> -->
@@ -171,13 +171,13 @@ export default {
       oldShopPhone: '',
       oldReturnPhone: '',
       rules: {
-        shopPhone: [
-          { required: true, message: '请输入注册手机号', trigger: 'blur' },
-          {
-            pattern: /^1[3456789]\d{9}$/,
-            message: '目前只支持中国大陆的手机号码'
-          }
-        ],
+        // shopPhone: [
+        //   { required: true, message: '请输入注册手机号', trigger: 'blur' },
+        //   {
+        //     pattern: /^1[3456789]\d{9}$/,
+        //     message: '目前只支持中国大陆的手机号码'
+        //   }
+        // ],
         returnPhone: [
           { required: true, message: '请输入联系电话', trigger: 'blur' },
           {