前端

xiaochengxu/components/ossutil/uploadFile.js

@@ -21,7 +21,6 @@ const uploadFile = function (filePath, dir, successc, failc) {
     })
     return;
   }
-  
   //图片名字 可以自行定义，     这里是采用当前的时间戳 + 150内的随机数来给图片命名的
   const aliyunFileKey = dir + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
   

xiaochengxu/main.js

@@ -11,7 +11,10 @@ Vue.use(uView)
 Vue.prototype.$request = request
 import store from './store'
 Vue.prototype.$store = store
-
+import MescrollBody from "@/components/mescroll-uni/components/mescroll-body/mescroll-body.vue"
+import MescrollUni from "@/components/mescroll-uni/components/mescroll-uni/mescroll-uni.vue"
+Vue.component('mescroll-body', MescrollBody)
+Vue.component('mescroll-uni', MescrollUni)
 App.mpType = 'app'
 
 const app = new Vue({

xiaochengxu/pages/mySet/cardType.vue

@@ -1,28 +1,26 @@
 <template>
 	<view>
-		<u-list @scrolltolower="scrolltolower">
-			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
-			</u-list-item>
-			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
-			</u-list-item>
-			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
-			</u-list-item>
-			<u-list-item>
-				我是地址我是地址我是地址我是地址我是地址
-			</u-list-item>
-		</u-list>
-		<u-modal :show="show" title="新增分类" >
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback">
+			<u-list @scrolltolower="scrolltolower">
+				<u-list-item  v-for='item in cardTypeList'>
+					<view class='flex'>
+						{{item.name}}
+					{{item.circleName}}
+						<u-icon v-if='item.circleName!="默认分类"' @click="del(item)" name="trash-fill" color="#2979ff" size="28"></u-icon>
+						<u-icon @click="stick(item)" name="pushpin" color="#2979ff" size="28"></u-icon>
+					</view>
+				</u-list-item>
+			</u-list>
+		</mescroll-body>
+		<u-modal showCancelButton='true'
+				@confirm='$u.debounce(confirm, 500)'
+				@cancel='show=false' :show="show" title="新增分类" >
 			<view class="slot-content">
 				<u--input
-				v-model="model1.userInfo.sex"
+				v-model="cardTypeData.circleName"
 				placeholder="输入分类名称，2-8个字符"
 				border="none"
-				showCancelButton='true'
-				@confirm='confirm'
-				@cancel='show=false'
+				
 				></u--input>
 			</view>
 		</u-modal>
@@ -34,16 +32,171 @@
 </template>
 
 <script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	export default {
+		mixins: [MescrollMixin],
 		data() {
 			return {
 				show:false,
+				page:1,
+				limit:20,
+				cardTypeList:[],
+				cardTypeData:{},
+				userInfo:{},
 			};
 		},
+		onLoad() {
+			
+				// this.getList()
+		},
+		onShow() {
+			this.userInfo = uni.getStorageSync("userInfo")
+			this.cardTypeData.commonId=uni.getStorageSync("userInfo").id
+		},
 		methods: {
-			del(){
+			mescrollInit(){
 				
 			},
+			downCallback(){
+				
+			},
+			upCallback(page){
+				var that = this
+				uni.showLoading({
+						title: '数据加载中'
+					})
+				this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list',{
+					page:page.num,
+					limit:page.size,
+					commonId:uni.getStorageSync("userInfo").id
+				}, failres => {
+					console.log('res+++++', failres.errmsg)
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					console.log(res)
+					if(page.num == 1) this.cardTypeList = [];
+					let curPageLen = res.data.items.length;
+					let totalPage = res.data.total;
+					if(res.data.items.length>0){
+						for(var i=0;i<res.data.items.length;i++){
+						res.data.items[i].name=res.data.items[i].circleName[0]
+						}
+						var itemIndex=res.data.items.findIndex((item)=>{return item.topMarking==1})
+						// console.log(itemIndex)
+						if(itemIndex!=-1){
+							var data=res.data.items.splice(itemIndex,1)
+							if(page.num==1){
+								data.push({circleName:'默认分类',name:'默'})	
+							}
+							// console.log(data.concat(res.data.items))
+							res.data.items=data.concat(res.data.items)
+						}else{
+							if(page.num==1){
+								res.data.items=[{circleName:'默认分类',name:'默'}].concat(res.data.items)	
+							}
+						}
+						this.cardTypeList=this.cardTypeList.concat(res.data.items)
+					}else{
+						if(page.num==1){
+							this.cardTypeList=[{circleName:'默认分类',name:'默'}]
+						 }
+					}
+					
+					
+					this.$nextTick(() => {
+						console.log(that)
+					// mescroll.endSuccess(data.result);
+					that.mescroll.endBySize(curPageLen, totalPage)
+					});
+					
+					// if (res.errno == 200) {
+					uni.hideLoading()
+					
+					// }
+				})
+			},
+			del(item){
+				uni.showLoading({
+					title: '加载中',
+					mask:true
+				})
+				this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'delete',{
+					commonId:uni.getStorageSync("userInfo").id,
+					id:item.id
+				}, failres => {
+					console.log('res+++++', failres.errmsg)
+					uni.showToast({
+					    title: failres.errmsg,
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+				}).then(res => {
+					uni.showToast({
+					    title: '删除成功',
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+					this.mescroll.resetUpScroll( )
+				}).catch(res => {
+					uni.showToast({
+					    title: '置顶失败',
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+				})
+			},
+			stick(item){
+				uni.showLoading({
+					title: '加载中',
+					mask:true
+				})
+				var type='',type1='',data={}
+				if(item.id){
+					type='admin.unimall.cardClassifyInfo'
+					type1='top'
+					data={
+						cardClassifyInfo:JSON.stringify({id:item.id})
+					}
+				}else{
+					type='admin.unimall.cardClassifyInfo'
+					type1='topDefault'
+					data={
+						cardClassifyInfo:JSON.stringify({commonId:this.cardTypeData.commonId})
+					}
+				}
+				this.$request.baseRequest(type, type1,data, failres => {
+					console.log('res+++++', failres.errmsg)
+					uni.showToast({
+					    title: failres.errmsg,
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+				}).then(res => {
+					uni.showToast({
+					    title: '置顶成功',
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+					this.mescroll.resetUpScroll( )
+				}).catch(res => {
+					uni.showToast({
+					    title: '置顶失败',
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+				})
+			},
+			
 			add(){
 				// if(){
 					
@@ -51,7 +204,44 @@
 				this.show=true
 			},
 			confirm(){
-				this.show=false
+				if(!this.cardTypeData.circleName){
+					uni.showToast({
+					    title: '分类名称不能为空！',
+					    icon: 'none',
+					    duration: 2000
+					})
+					return
+				}
+				if(this.cardTypeData.circleName<2||this.cardTypeData.circleName>8){
+					uni.showToast({
+					    title: '类别名称2-8个字！',
+					    icon: 'none',
+					    duration: 2000
+					})
+					return
+				}
+				this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'add',{
+						cardClassifyInfo:JSON.stringify(this.cardTypeData)
+					}, failres => {
+					console.log('res+++++', failres.errmsg)
+					uni.showToast({
+					    title: failres.errmsg,
+					    icon: 'none',
+					    duration: 2000
+					})
+					uni.hideLoading()
+				}).then(res => {
+					console.log(res)
+					// if (res.errno == 200) {
+					uni.hideLoading()
+					this.show=false
+					this.cardTypeData={
+						commonId:uni.getStorageSync("userInfo").id,
+					}
+					this.mescroll.resetUpScroll( )
+					// }
+				})
+				
 			}
 		}
 	}

xiaochengxu/pages/mySet/myHome.vue

@@ -8,60 +8,60 @@
 		    @change="change" @click="click">
 			</u-swiper>	
 		</view>
-		<view v-if='editstatus'>
-			<view>企业风采</view>
-			<!-- <image v-for='item in fileList' :src="item.url" mode=""></image> -->
-			<u-upload
-					@afterRead="afterRead"
-					:fileList="fileList1"
-					@delete="deletePic"
-					name="1"
-					multiple
-					:maxCount="10"
-				></u-upload>
-		</view>
 		<!-- <u-skeleton
 			    rows="3"
 			    title
 				loading
 		></u-skeleton> -->
 		<view class="company-title">
-			<view>公司名称</view>
+			<view v-if='editstatus'>公司/机构名称</view>
 		 	<u--input v-if='editstatus' v-model="companyData.companyName"  placeholder="请输入公司名称" border="none" ></u--input>
 			<view v-else>{{companyData.companyName}}</view>
 		</view>
 		<view class="intro">
-			<view>公司简介</view>
-			<u--input v-if='editstatus' v-model="companyData.companyIntroduction" placeholder="请输入公司简介" border="none" ></u--input>
+			<view v-if='editstatus'>公司/机构简介</view>
+			<u--input type='textarea' v-if='editstatus' v-model="companyData.companyIntroduction" placeholder="请输入公司简介" border="none" ></u--input>
 			<view v-else>{{companyData.companyIntroduction}}</view>
 		</view>
 		<view class="scope">
 			<view>业务范围</view>
-			<u--input v-if='editstatus' v-model="companyData.scopeOfBusiness" placeholder="请输入业务范围" border="none" ></u--input>
+			<u--input type='textarea' v-if='editstatus' v-model="companyData.scopeOfBusiness" placeholder="输入业务范围，不超过500个字" border="none" ></u--input>
 			<view v-else>{{companyData.scopeOfBusiness}}</view>
 		</view>
 		<u-list>
 			<u-list-item>
-				<view>公司地址</view>
-				<u--input v-if='editstatus' v-model="companyData.companyAddress" placeholder="请输入公司地址" border="none" ></u--input>
+				<view v-if='editstatus'>公司地址</view>
+				<u--input v-if='editstatus' v-model="companyData.companyAddress" placeholder="输入地址" border="none" ></u--input>
 				<view v-else>{{companyData.companyAddress}}</view>
 			</u-list-item>
 			<u-list-item>
-				<view>公司电话</view>
-				<u--input v-if='editstatus' v-model="companyData.phone" placeholder="请输入公司电话" border="none" ></u--input>
+				<view v-if='editstatus'>联系电话</view>
+				<u--input v-if='editstatus' v-model="companyData.phone" placeholder="输入联系电话" border="none" ></u--input>
 				<view v-else>{{companyData.phone}}</view>
 			</u-list-item>
 			<u-list-item>
-				<view>公司传真</view>
-				<u--input v-if='editstatus' v-model="companyData.portraiture" placeholder="请输入公司传真" border="none" ></u--input>
+				<view v-if='editstatus'>传真</view>
+				<u--input v-if='editstatus' v-model="companyData.portraiture" placeholder="输入传真号" border="none" ></u--input>
 				<view v-else>{{companyData.portraiture}}</view>
 			</u-list-item>
 			<u-list-item>
-				<view>公司邮箱</view>
-				<u--input v-if='editstatus' v-model="companyData.postbox" placeholder="请输入公司邮箱" border="none" ></u--input>
+				<view v-if='editstatus'>邮箱</view>
+				<u--input v-if='editstatus' v-model="companyData.postbox" placeholder="输入邮箱" border="none" ></u--input>
 				<view v-else>{{companyData.postbox}}</view>
 			</u-list-item>
 		</u-list>
+		<view v-if='editstatus'>
+			<view>企业风采</view>
+			<!-- <image v-for='item in fileList' :src="item.url" mode=""></image> -->
+			<u-upload
+					@afterRead="afterRead"
+					:fileList="fileList1"
+					@delete="deletePic"
+					name="1"
+					multiple
+					:maxCount="10"
+				></u-upload>
+		</view>
 		<view class="footer">
 			<view v-if='!editstatus' @click='edit' class='button'>编辑</view>
 			<view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view>