Merge pull request 'lj' (#65) from lj into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/65

components/DropDown/DropDown.vue

@@ -55,7 +55,8 @@
 			}
 		},
 		created() {
-			this.postlist[1]=JSON.parse(uni.getStorageSync('regionList'))
+			this.postlist[0]=JSON.parse(uni.getStorageSync('classList'))
+			// this.postlist[1]=JSON.parse(uni.getStorageSync('regionList'))
 		},
 		methods: {
 			changeActiveIndex(index) {

components/ShowShopList/ShowShopList.vue

@@ -5,6 +5,7 @@
 			:key="shopid"
 			:shopInfo="item"
 			:is-adshow="isADshow"
+			:adlinkPath="adlinkPath"
 			:show-style="showStyle"
 			:is-edit="isEdit"
 			@delItem="handleDel"
@@ -39,17 +40,44 @@
 					return true
 				}
 			},
+			adlinkPath: {
+				type: String,
+				default() {
+					return ''
+				}
+			},
 			isEdit: {
 				type: Boolean,
 				default() {
 					return false
 				}
 			},
+			//获取列表类型传递参数部分
+			listType:{
+				type: Number,
+				default() {
+					return 1
+				}
+			},
+			pageSize: {
+				type: Number,
+				default() {
+					return 5
+				}
+			},
+			pageNum: {
+				type: Number,
+				default() {
+					return 1
+				}
+			},
 			shopInfoList: {
 				type: Array,
 				default() {
 					return [
 						{
+							id: 1,
+							type: 1,
 							shopid: 1,
 							imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
 							title: '琴行铺面转让',
@@ -65,26 +93,45 @@
 							phoneNum: 13348946108,
 						},
 						{
-							shopid: 2,
+							"id": "1",
-							imageUrl: 'https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg',
+							"pic": "3",
-							title: '琴行铺面转让',
+							"tt": "333",
-							promotionNum: 23,
+							"type": "0",
-							price: 5000,
+							"adress": "",
-							date: '2023-11-02',
+							"trade1": "啊",
-							pos: '锦江区',
+							"trade2": "餐馆",
-							exactPos: '锦江区-汇源南路366号',
+							"btype1": "",
-							sqr: 200,
+							"btype2": "",
-							zrfText: "转让费：20000万",
+							"area1": "青羊区",
-							category: '餐饮美食',
+							"area2": "",
-							uname: "王先生",
+							"mianji": "33",
-							phoneNum: 13348946108,
+							"zhuanrangfei": "44",
+							"zujin": "44",
+							"hits": "0",
+							"58url": "",
+							"personurl": "",
+							"kw": "",
+							"remark": "",
+							"content": "44vv",
+							"pics": "",
+							"user_level_id": "1",
+							"lianxiren": "3333",
+							"mobile": "44444",
+							"status": "1",
+							"shangpulx": "1",
+							"zhuangtai": "1",
+							"lng": "2222.00000000",
+							"lat": "3333.00000000",
+							"pub_time": "0",
+							"create_time": "1699973131",
+							"update_time": "1699973131",
+							"delete_time": "0",
+							"userid": "1",
+							"success": "2"
 						}
 					]
 				}
 			}
-		},
-		computed: {
-			
 		},
 		methods: {
 			handleDel(shopid){
@@ -93,7 +140,21 @@
 				// TODO：不能直接修改
 				// if(delindex !== -1)  this.shopInfoList = this.shopInfoList.slice(delindex,1)
 				// console.log(this.shopInfoList);
+			},
+			getList() {
+				const query = this.$u.queryParams({
+					type: this.listType,
+					pageSize: this.pageSize,
+					pageNum: this.pageNum
+				})
+				this.$api.getShopList(query).then(res => {
+					console.log("shoplist",res.data.data);
+					
+				})
 			}
+		},
+		created() {
+			this.getList()
 		}
 	}
 </script>

components/ShowShopListItem/ShowShopListItem.vue

@@ -2,7 +2,7 @@
 	<view class="list-border">
 		<view class="list-container" @click="enterDetail()">
 			<view class="shop-list-img" >
-				<u-image width="80px" height="80px" :src="shopInfo.imageUrl" radius="8px"></u-image>
+				<u-image width="80px" height="80px" :src="shopInfo.pics" radius="8px"></u-image>
 			</view>
 			<view class="text-area">
 				<text style="font-weight: 500;">{{shopInfo.title}}</text>
@@ -11,13 +11,13 @@
 						<view>
 							<u-image src="/static/shoplist/sy_icon_lbdw.png" width="12px" height="15px"></u-image>
 						</view>
-						<text>{{shopInfo.pos}}</text>
+						<text>{{shopInfo.area1}}</text>
 					</view>
 					<view>
 						<view>
 							<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
 						</view>
-						<text>{{shopInfo.sqr}}m2</text>
+						<text>{{shopInfo.mianji}}m2</text>
 					</view>
 				</view>
 				<view v-else class="pos-and-sqr pos-only" >
@@ -25,13 +25,13 @@
 						<view>
 							<u-image src="/static/shoplist/dp_icon_hhhdw.png" width="12px" height="15px"></u-image>
 						</view>
-						<text>{{shopInfo.exactPos}}</text>
+						<text>{{shopInfo.area2}}</text>
 					</view>
 				</view>
 				<view class="rent-and-date">
-					<text>租金：{{shopInfo.price}}元/月</text>
+					<text>租金：{{shopInfo.zujin}}元/月</text>
-					<text v-if="showStyle == 0">发布日期：{{shopInfo.date}}</text>
+					<text v-if="showStyle == 0">发布日期：{{shopInfo.create_time}}</text>
-					<text v-if="showStyle == 1">{{shopInfo.zrfText}}</text>
+					<text v-if="showStyle == 1">转让费：{{shopInfo.zhuanrangfei}}</text>
 				</view>
 			</view>
 		</view>
@@ -41,25 +41,25 @@
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lbpm.png" width="12px" height="15px"></u-image>
 				</view>
-				<text>{{shopInfo.sqr}}m2</text>
+				<text>{{shopInfo.mianji}}m2</text>
 			</view>
 			<view>
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lblhy.png" width="12px" height="15px"></u-image>
 				</view>
-				<text>{{shopInfo.category}}</text>
+				<text>{{shopInfo.trade1}}</text>
 			</view>
 			<view>
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lbxm.png" width="12px" height="15px"></u-image>
 				</view>
-				<text>{{shopInfo.uname}}</text>
+				<text>{{shopInfo.lianxiren}}</text>
 			</view>
 			<view>
 				<view>
 					<u-image src="/static/shoplist/sy_icon_lblxr.png" width="12px" height="15px"></u-image>
 				</view>
-				<text>{{shopInfo.phoneNum}}</text>
+				<text>{{shopInfo.mobile}}</text>
 			</view>
 		</view>
 		
@@ -67,7 +67,7 @@
 			v-if="isADShow"
 			class="list-ads bottom-common" 
 			style="font-size: 11px;"
-			@click="handleAD()"
+			@click="handleAD"
 			>
 			<view>
 				<text>已将该店推给</text> 
@@ -78,11 +78,11 @@
 		</view>
 		
 		<view v-if="isEdit" class="del-and-edit bottom-common">
-			<view class="edit" @click="handleEdit(shopInfo.shopid)">
+			<view class="edit" @click="handleEdit(shopInfo.id)">
 				<u-image src="/static/shoplist/dp_icon_pj.png" width="12px" height="15px"></u-image>
 				<text>编辑</text>
 			</view>
-			<view class="del" @click="handleDel(shopInfo.shopid)">
+			<view class="del" @click="handleDel(shopInfo.id)">
 				<u-image src="/static/shoplist/dp_icon_sc.png" width="12px" height="15px"></u-image>
 				<text>删除</text>
 			</view>
@@ -95,7 +95,8 @@
 	 * @property {Object}   shopInfo          传入商铺对象数据
 	 * @property {Number}   showStyle        展示商铺的样式类型(0为首页默认)
 	 * @property {Boolean}  isADshow         是否显示推广广告
-	 * @property {Boolean}  isEdit           是否显示编辑和删除
+	 * @property {Boolean}  isEdit   		是否显示编辑和删除
+	 * @property {String}   adlinkPath        推广广告链接
 	 */
 	export default {
 		props: {
@@ -107,24 +108,35 @@
 					}
 				}
 			},
+			// 展示商铺的样式类型
 			showStyle:{
 				type: Number,
 				default() {
 					return 0
 				}
 			},
+			// 是否展示推广广告
 			isADShow: {
 				type: Boolean,
 				default() {
 					return true
 				}
 			},
+			// 推广广告链接
+			adlinkPath: {
+				type: String,
+				default() {
+					return ''
+				}
+			},
+			// 是否可编辑
 			isEdit: {
 				type: Boolean,
 				default() {
 					return false
 				}
-			}
+			},
+			
 			
 		},
 		data() {
@@ -142,19 +154,34 @@
 				console.log("点击了编辑ID为",shopid);
 			},
 			handleDel(shopid) {
+				// 需完善删除请求
 				this.$emit('delItem', shopid)
 			},
 			enterDetail(){
+				// console.log("进入详情页面");
+				const query=this.$u.queryParams({
+					id: this.shopInfo.id,
+					type: this.shopInfo.type
+				})
+				// console.log("query",query);
 				uni.navigateTo({
-					url: '/pages/detail/detail'
+					url: '/pages/detail/detail' + `${query}`
 				})
 			},
 			handleAD(){
-				uni.navigateTo({
+				// TODO 完成页面跳转
-					url: '/pages/publish/publishTransfer/publishTransfer'
+				if (this.adlinkPath) {
-				})
+					uni.navigateTo({
+						url: this.adlinkPath
+					})
+				}else {
+					uni.navigateTo({
+						url: '/pages/publish/publishTransfer/publishTransfer'
+					})
+				}
 			}
-		}
+		},
+		
 	}
 </script>
 

pages/Partnerships/Partnerships.vue

@@ -29,15 +29,25 @@
 </template>
 
 <script>
+import form from 'uview-ui/libs/config/props/form';
+
 	export default {
 		data() {
 			return {
 				show: false,
+				submitForm:{
+					name:'',
+					idcode:''
+				}
 			}
 		},
 		methods: {
 			submit(){
-				console.log('提交');
+				console.log('提交',form);
+				
+					//this.$u.api.submit( this.form )
+					uni.$u.toast('提交成功')
+				
 			},
 			confirmCheckWay(e){
 				
@@ -74,7 +84,7 @@
 		margin-top: 10rpx;
 		margin-left: 17rpx;     
 		color: #c1c1c1;
-		font-size: 27rpx;
+		/* font-size: 27rpx; */
 	}
 	
 </style>

pages/index/NavBarPages/czxx/czxx.vue

@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<ShowShopList :showStyle="2"/>
+			<ShowShopList :showStyle="2" :adlinkPath = "adlinkPath"/>
 		</view>
 	</view>
 </template>
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				
+				adlinkPath: "/pages/publish/publishRent/publishRent"
 			}
 		},
 		methods: {

pages/index/NavBarPages/xmzs/xmzs.vue

@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<ShowShopList :showStyle="2"/>
+			<ShowShopList :showStyle="2" :adlinkPath="adlinkPath"/>
 		</view>
 	</view>
 </template>
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				
+				adlinkPath: "/pages/publish/publishInvestment/publishInvestment"
 			}
 		},
 		methods: {

pages/index/index.vue

@@ -42,7 +42,7 @@
 				notice: [],
 				chooseIndex: 0,
 				statNum: {},
-				swiperList: []
+				swiperList: [],
 			}
 		},
 		onLoad() {
@@ -74,7 +74,12 @@
 			},
 			getClassList() {
 				this.$api.getClassList().then(res => {
-					console.log(res.data.data);
+					let data = res.data.data
+					data.sort((a,b)=>{
+						return a.id - b.id
+					})
+					data = data.map(item => item.name)
+					uni.setStorageSync('classList', JSON.stringify(data))
 				})
 			},
 			getRegionList() {

service/request.js

@@ -239,6 +239,21 @@ const apiService = {
 			resolve(service.post(url))
 		})
 	},
+	//招募合伙
+	toBePartner(data){
+		const url = `/center/partner`
+		return new Promise((resolve,reject) => {
+			console.log(data);
+			resolve(service.post(url,data))
+		})
+	},
+	//获取商铺列表
+	getShopList(query){
+		const url = `/shop/alllist${query}`
+		return new Promise((resolve,reject) => {
+			resolve(service.get(url))
+		})
+	}
 }
 export {
 	apiService,