Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents 7c305904 00c437f2
Showing 15 changed files with 276 additions and 53 deletions
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/components/buscha/busCha.vue
admin-web-master/src/components/chakan/ggsh.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/aaa/index.vue
ceres-uniapp-master/components/canvasShow/basics/banner.vue
ceres-uniapp-master/config/api.js
lvdao-miniapp/pages.json
lvdao-miniapp/pages/details/details.vue
lvdao-miniapp/pages/home/home.vue
lvdao-miniapp/pagesA/PunchInAct/PunchInDetails.vue
lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
lvdao-miniapp/pagesA/weball/shopweb.vue
lvdao-miniapp/utils/request.js
@@ -26,7 +26,7 @@
       </el-form-item> -->
       <el-form-item label="轮播顺序" prop="carouselId" >
         <el-select v-model="formInline.carouselId" placeholder="请选择" style="width: 100%;" @change="handleSelectChange">
-          <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'+`${item.type==1?'商城端':'商家端'}`" :value="item.id"></el-option>
+          <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'+`${item.type==1?'在线商城端':'商家端小程序'}`" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="广告尺寸" prop="dimensions" >
@@ -201,7 +201,7 @@
             <div>
               <el-table :data="tableData"
                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                <el-table-column label="商铺名称">
+                <el-table-column label="资源名称">
                   <template slot-scope="scope">
                     {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
@@ -13,8 +13,8 @@
                     <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
-                <el-form-item label="投放内容" prop="adTitle">
-                  <div class="duiqi">{{info.adTitle}}</div>
+                <el-form-item label="投放内容" prop="redirectUrl">
+                  <div class="duiqi">{{info.redirectUrl}}</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -22,7 +22,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'http://128.10.249.9:9003';
+  baseURL = 'http://192.168.8.103:9003';
 } else {
@@ -22,7 +22,8 @@
           </el-table-column> -->
           <el-table-column label="轮播图" prop="" min-width="20%">
             <template slot-scope="scope">
-              <el-image  style="height: 80px;" :src="scope.row.imageUrl" fit="contain"></el-image>
+              <el-image  style="height: 80px;" :src="scope.row.imageUrl" fit="contain" v-if="scope.row.state !=1"></el-image>
+			  <el-image  style="height: 80px;" src="https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg" fit="contain" v-else></el-image>
             </template>
           </el-table-column>
@@ -33,7 +34,7 @@
           </el-table-column>
 		  <el-table-column label="发布类型" min-width="20%" prop="type" >
 			  <template slot-scope="scope">
-			    {{ scope.row.type==1?'商城端':'商家端' }}
+			    {{ scope.row.type==1?'在线商城端':'商家端小程序' }}
 			  </template>
 		  </el-table-column>
           <el-table-column label="操作" min-width="17%">
@@ -66,10 +67,10 @@
 				<el-form-item label="发布端口" prop="type">
 				  <el-select v-model="formInline.type" placeholder="请选择"  style="width:100%">
 					  <el-option
-					    label="商城端" :value="1">
+					    label="在线商城端" :value="1">
 					  </el-option>
 				    <el-option
-				      label="商家端" :value="2">
+				      label="商家端小程序" :value="2">
 				    </el-option>
 				  </el-select>
 				</el-form-item>
@@ -105,7 +106,7 @@
     data() {
       return {
         currentPage: 1,
-        total: 100,
+        total: 0,
         flag: false,
         pageSize: 10,
         ggXin: false,
@@ -44,7 +44,7 @@
 		NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
 			res.data.content.map(item=>{
 				 if(item.state ==1){
-					 item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
+					 item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg'
 					 item.jumpUrl = ''
 				 } 
@@ -4,15 +4,15 @@
 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
 // const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003' 
 // const DOMAIN_PREFIX = 'http://128.10.249.9:9007'
-// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
-// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
+const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
-const host = `${window.location.protocol}//${window.location.host}`
-const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
-const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
-const TIAOZHUAN = `${host}/cdwlMall/`
+// const host = `${window.location.protocol}//${window.location.host}`
+// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
+// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
+// const TIAOZHUAN = `${host}/cdwlMall/`
@@ -493,6 +493,13 @@
 				}
 			},
 			{
+				"path": "weball/shopweb",
+				"style": {
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTitleText": ""
+				}
+			},
+			{
 				"path": "tishi/tishi",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
@@ -192,19 +192,17 @@
 					</u-row>
 				</view>
 			</view>
-			<view class="banner-item position" v-if="tableData.shopName" @click="gomapApp(latitude,longitude)">
+			<view class="banner-item position" v-if="tableData.shopName" @click.stop="gomapApp(latitude,longitude)">
 				<view class="banner-item-title">位置信息</view>
-				<view style="margin-top: 16rpx;" @click="gomapApp(latitude,longitude)">
-					<map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287" @click="gomapApp(latitude,longitude)" >
-						<view class="position-info"  @click="gomapApp(latitude,longitude)">
+				<view style="margin-top: 16rpx;" @click.stop="gomapApp(latitude,longitude)">
+					<map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287" @click.stop="gomapApp(latitude,longitude)" >
+						<view class="position-info"  @click.stop="gomapApp(latitude,longitude)">
 							<u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
 								height="20rpx"></u-image>
-							<view @click="gomapApp(latitude,longitude)">
+							<view @click.stop="gomapApp(latitude,longitude)">
 								<text v-if="tableData.shopName">{{tableData.detailedLocation}}</text>
 								<u-parse :html="tableData.description" v-else></u-parse>
 							</view>
-
-
 						</view>
 					</map>
 				</view>
@@ -280,7 +278,6 @@
 			let ce = decodeURIComponent(option.item)
 			let data = JSON.parse(ce)
-			console.log(data)
 			if (data.shopName) {
 				this.qianzui = 'sp'
@@ -69,14 +69,14 @@
 							<text>租广告</text>
 						</view>
 					</view>
-		<!-- 			<view class="list" @click="wuye">
+					<view class="list" @click="wuye">
 						<view class="icon">
 							<image :src="$imgUrl('/gouwulan.png')"></image>
 						</view>
 						<view class="title">
 							<text>商城</text>
 						</view>
-					</view> -->
+					</view>
 				<!-- 	<view class="list" @click="wuye">
 						<view class="icon">
 							<image :src="$imgUrl('/home4.png')"></image>
@@ -544,7 +544,7 @@
 				this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex, 1).then(res => {
 					res.data.data.content.map(item=>{
 						 if(item.state ==1){
-							 item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
+							 item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg'
 							 item.jumpUrl = ''
 						 } 
@@ -711,11 +711,12 @@
 			wuye() {
 				if(uni.getStorageSync('user').phone&&uni.getStorageSync('user').phone != ''){
 					uni.navigateTo({
-						url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/?phone=${uni.getStorageSync('user').phone}`
+						url: `/pagesA/weball/shopweb?phone=${uni.getStorageSync('user').phone}`
 					})
-				}else{
+				}else{ 
+						console.log('2222222')
 					uni.navigateTo({
-						url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
+						url: `/pagesA/weball/shopweb?phone="1"`
 					})
 				}
@@ -6,7 +6,7 @@
 				<image :src="imgurl+tableData.imageUrl" style="width: 100%; height: 100vw; border-radius: 10rpx;"></image>
 	  		</view>
 			<view class="title" style="margin-top: 20rpx;">{{tableData.title}}</view>
-			<view style="width: 100%;height: 1px; background-color: #D8D8D8;margin: 20rpx 0 ;"></view>
+			<view style="width: 100%;height: 1px; background-color: rgba(#D8D8D8, 0.5);margin: 20rpx 0 ;"></view>
 			<view class="title" style="margin-top: 20rpx;display:flex;" >
 			   <view style="font-size: 12px;padding:2px 8px;border: 1px solid #0FBB59; color: #0FBB59;margin:0 5px; border-radius: 10px;font-weight: 300;" v-for="(item,index) in list">{{item}}</view>
 			</view>
@@ -3,23 +3,75 @@
 		<view class="page-info">
 			<view class="info-box">
 				<view class="title">参与时间</view>
-				<radio-group v-model="participateTimeType">
-					<label class="radio-label" v-for="(item, index) in timeOptions" :key="index">
-						<radio :value="item.value" :color="item.value === 'sync' ? '#4CD964' : '#C8C9CC'"></radio>
-						<view class="radio-text">{{ item.label }}</view>
-					</label>
-				</radio-group>
+				<u-radio-group v-model="participateTimeType" :wrap="true">
+							<u-radio 
+										@change="radioChange" 
+										v-for="(item, index) in timeOptions" :key="index" 
+										:name="item.name"
+										active-color="#4CD964"
+									>
+										{{item.name}}
+									</u-radio>
+					
+				</u-radio-group>
+				<u-input v-if="participateTimeType=='自定义时间'" style="width: 30%;"  v-model="form.canyutiem" type="select" @click="establishow = true"
+					placeholder="请选择" />
+				<u-picker mode="time" v-model="establishow" :params="params"
+					@confirm="establiChange"></u-picker>
 			</view>
 			<view class="info-box">
-				<view class="title">奖品设置</view>
-
+				<view style="display: flex; justify-content: space-between;">
+					<view class="title">奖品设置</view>
+					<view @click="addjiangli" class="" style="font-size: 14px;color: #0FBB59;font-weight: bold;">添加奖励<u-icon name="play-right-fill" color="#0FBB59" size="23"></u-icon></view>		
+				</view>
+				<view style="width: 100%;height: 1px; background-color: rgba(#D8D8D8, 0.5);margin: 20rpx 0 ;"></view>
+				<view>
+					<u-table :borde="false">
+							<u-tr>
+								<u-th>名称</u-th>
+								<u-th>奖品</u-th>
+								<u-th>数量</u-th>
+							</u-tr>
+							<u-tr>
+								<u-td>浙江大学</u-td>
+								<u-td>二年级</u-td>
+								<u-td>22</u-td>
+							</u-tr>
+							<u-tr>
+								<u-td>清华大学</u-td>
+								<u-td>05班</u-td>
+								<u-td>20</u-td>
+							</u-tr>
+						</u-table>
+				</view>
 			</view>
 			<view class="info-box">
-				<view class="title">规则介绍</view>
-
-
-			</view>
+				<view style="display: flex; justify-content: space-between;">
+					<view class="title">打卡设置</view>
+					<view @click="dakaSet" class="" style="font-size: 14px;color: #0FBB59;font-weight: bold;">打卡设置<u-icon name="play-right-fill" color="#0FBB59" size="23"></u-icon></view>
+				</view>
+				<view style="width: 100%;height: 1px; background-color: rgba(#D8D8D8, 0.5);margin: 20rpx 0 ;"></view>
+				<view>
+					<u-table :borde="false">
+							<u-tr>
+								<u-th>打卡点</u-th>
+								<u-th>位置</u-th>
+								<u-th>奖励</u-th>
+							</u-tr>
+							<u-tr>
+								<u-td>浙江大学</u-td>
+								<u-td>二年级</u-td>
+								<u-td>22</u-td>
+							</u-tr>
+							<u-tr>
+								<u-td>清华大学</u-td>
+								<u-td>05班</u-td>
+								<u-td>20</u-td>
+							</u-tr>
+						</u-table>
+				</view>
+			</view>	
 		</view>
@@ -43,6 +95,57 @@
 				</u-form>
 			</view>
 		</u-popup>
+		<u-popup class="userForm" v-model="addjiangliShow" mode="center" border-radius="20" :closeable="false" width="100%">
+			<view style="padding: 20rpx;">
+				<u-form class="form-box" :model="jlForm" ref="uForm" :label-width="120">
+					<view style="padding: 10rpx;">
+						<!-- <view class="title">请填写您的报名信息</view> -->
+						<view style="font-weight: bold;font-size: 16px;">奖励类型</view>
+						<view><u-input v-model="jlForm.type"  /></view>
+						<view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>名称</view>
+						<view><u-input v-model="jlForm.name" /></view>
+						<view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>奖品数量</view>
+						<view><u-input v-model="jlForm.num" /></view>
+						<view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>奖品图片</view>
+						<view>
+							<u-upload style="display: flex;flex-wrap:wrap" :action="$upload" :auto-upload="false"
+								ref="coverImage" :max-count="1" :file-list="fist"
+								@on-remove="(response, file, fileList) => removeList(response, file, fileList)"
+								@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
+						</view>
+						<view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>兑奖方式</view>
+						<view>
+							<u-radio-group v-model="jlForm.fangshi" >
+										<u-radio 
+													@change="radioChange" 
+													v-for="(item, index) in fangshi" :key="index" 
+													:name="item.name"
+													active-color="#4CD964"
+												>
+													{{item.name}}
+												</u-radio>
+							</u-radio-group>
+						</view>
+						<view style="display: flex;justify-content: space-between;margin-top: 10px;">
+							<u-button type="" style="width: 45%;" @click="submit">取消</u-button>
+							<u-button type="success" style="width: 45%;" @click="submit">提交</u-button>
+						</view>
+					</view>
+				</u-form>
+			</view>
+		</u-popup>
+		<u-popup class="userForm" v-model="dakaShow" mode="center" border-radius="20" :closeable="true" width="100%">
+			<view style="padding: 30rpx;">
+				<u-form class="form-box" :model="form" ref="uForm" :label-width="120">
+					<view style="padding: 10rpx;">
+						<view class="title">请填写您的报名信息</view>
+						<u-form-item label="*姓名"><u-input v-model="form.userName" /></u-form-item>
+						<u-form-item label="*电话"><u-input v-model="form.userPhone" /></u-form-item>
+						<u-button type="success" @click="submit">提交</u-button>
+					</view>
+				</u-form>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -51,19 +154,38 @@
 	export default {
 		data() {
 			return {
+				fist: [],
 				tableData: {},
 				list: ['标签', '标签', '标签'],
-				participateTimeType: 'sync', // 默认选中同步活动周期
+				participateTimeType: '同步活动周期', // 默认选中同步活动周期
 				timeOptions: [{
-						value: 'sync',
-						label: '同步活动周期'
+						disabled: true,
+						name: '同步活动周期'
+					},
+					{
+						disabled: false,
+						name: '自定义时间'
+					}
+				],
+				fangshi:[
+				{
+						disabled: true,
+						name: '现场兑换'
 					},
 					{
-						value: 'custom',
-						label: '自定义时间'
+						disabled: false,
+						name: '邮寄'
 					}
 				],
 				joinShow: false,
+				establishow:false,
+				addjiangliShow:false,
+				dakaShow:false,
+				params: {
+					year: true,
+					month: true,
+					day: true
+				},
 				form: {
 					activityId: '',
 					userId: '',
@@ -71,6 +193,14 @@
 					createUser: '',
 					userName: '',
 					userPhone: '',
+					canyutiem:''
+				},
+				jlForm:{
+					type:'',
+					name:'',
+					num:'',
+					tu:'',
+					fangshi:'',
 				},
 				pagesize: {
 					id: null,
@@ -156,6 +286,64 @@
 				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 			},
+			radioChange(val){
+				this.form.canyutiem  = ''
+			},
+			establiChange(val){
+				this.form.canyutiem = this.timeChange(val)
+			},
+			timeChange(val) {
+				const {
+					year,
+					month,
+					day,
+				} = val;
+				return `${year}-${month}-${day}`;
+			},
+			addjiangli(){
+				this.addjiangliShow = true
+			},
+			dakaSet(){
+				
+			},
+			removeList(e, file, fileList) {
+				this.jlForm.tu.splice(e, 1)
+				this.fist.splice(e, 1)
+			},
+			onsuccess1(e, file, fileList, ziduan) {
+			
+				let index = 0
+				if (this.jlForm.tu.length != 0) {
+					index = this.jlForm.tu.length
+				}
+			
+				uni.uploadFile({
+					url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
+					filePath: e[index].url,
+					name: 'file', // 后端接收的文件参数名
+					formData: {
+						filePath: 'xcx', // 其他表单数据
+					},
+					success: (uploadFileRes) => {
+			
+			
+						this.jlForm.tu.push(this.$img + JSON.parse(uploadFileRes.data).data)
+			
+						uni.showToast({
+							title: '上传成功',
+							icon: 'success',
+						});
+					},
+					fail: (err) => {
+						console.log('上传失败', this.fist)
+			
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none',
+						});
+					},
+				});
+			},
 		}
 	};
 </script>
@@ -264,7 +452,7 @@
 		margin: 0 40rpx;
 		.form-box {
-			padding: 18rpx 30rpx;
+			padding: 0rpx 0rpx;
 		}
@@ -162,7 +162,8 @@
 				pageindex: {
 					pageNumber: 0,
 					pageSize: 100,
-					contactNumber:''
+					contactNumber:'',
+					dataStatus:"1"
 				},
 				ids:'',
 				showUp:true
+<template>
+	<view>
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url:'https://zhgw-uat.028wlkj.com/cdwlMall/meh5/'
+			}
+		},
+		onLoad(e) {
+			if(e.phone !='1') {
+					this.url = `https://zhgw-uat.028wlkj.com/cdwlMall/meh5/?phone=${e.phone}`
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
@@ -20,7 +20,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
 		// bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
-		
+
 		// bases = 'http://128.10.249.9:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;