Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

xiaochengxu/pages.json

@@ -163,6 +163,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/mySet/editCard",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "编辑名片",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"custom": false,

xiaochengxu/pages/mySet/myInfo.vue

@@ -39,8 +39,8 @@
 					<u-button text="置顶" @click="topMarking(item)" throttle-time='1000'></u-button>
 					<!-- <button @click="$u.debounce(topMarking, 500)">置顶</button> -->
 					<!-- <button @click="$u.debounce(topMarking(item), 500)">置顶</button> -->
-					<button>删除</button>
-					<button>编辑</button>
+					<u-button text="删除" @click="del(item.id)" throttle-time='1000'></u-button>
+					<button @click="toEditCard(item)">编辑</button>
 				</view>
 			</view>
 		</view>
@@ -50,6 +50,24 @@
 			</view>
 		</view>
 		<u-toast ref="uToast"></u-toast>
+		<u-popup :show="isShowDel" @close="isShowDel=false" mode="center">
+			<view>
+				<text>删除名片自动退出关联得圈子，确定删除？</text>
+				<u-radio-group v-model="radiovalue" placement="column">
+					<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist" :key="index"
+						:label="item.name" :name="item.name" @change="radioChange">
+					</u-radio>
+				</u-radio-group>
+				<view class="flex">
+					<view class="">
+						取消
+					</view>
+					<view class="" @click="delCard">
+						删除
+					</view>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -58,6 +76,18 @@
 	export default {
 		data() {
 			return {
+				id: '',
+				radiovalue: '仅从自己名片列表删除',
+				radiolist: [{
+						name: '仅从自己名片列表删除',
+						disabled: false
+					},
+					{
+						name: '从所有拥有此名片用户列表删除',
+						disabled: false
+					}
+				],
+				isShowDel: false,
 				cardList: []
 			};
 		},
@@ -69,6 +99,9 @@
 			this.init()
 		},
 		methods: {
+			radioChange(n) {
+				console.log('radioChange', n);
+			},
 			init() {
 				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
 					commonId: this.userInfo.id
@@ -82,6 +115,43 @@
 					this.cardList = res.data.items
 				})
 			},
+			toEditCard(val) {
+				uni.navigateTo({
+					url: "/pages/mySet/editCard?itemVal="+JSON.stringify(val)
+				})
+			},
+			delCard() {
+				let _data = {}
+				if (this.radiovalue == '仅从自己名片列表删除') {
+					_data = {
+						id: this.id
+					}
+				} else {
+					_data = {
+						id: this.id,
+						deleteCondition: 1
+					}
+				}
+				that.$request.baseRequest('admin.unimall.cardManagementInfo', 'delete', _data, failres => {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					this.isShowDel = false
+					this.$refs.uToast.show({
+						type: 'success',
+						message: '删除成功！',
+					})
+					this.init()
+				})
+			},
+			del(val) {
+				this.id = val
+				this.isShowDel = true
+
+			},
 			addCard() {
 				uni.navigateTo({
 					url: "/pages/mySet/newCard"
@@ -89,7 +159,9 @@
 			},
 			topMarking(val) {
 				that.$request.baseRequest('admin.unimall.cardManagementInfo', 'top', {
-					cardManagementInfo: JSON.stringify({id:val.id})
+					cardManagementInfo: JSON.stringify({
+						id: val.id
+					})
 				}, failres => {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -101,7 +173,7 @@
 						type: 'success',
 						message: '置顶成功！',
 					})
-						this.init()
+					this.init()
 				})
 			}
 		}

xiaochengxu/pages/mySet/newCard.vue

@@ -30,16 +30,16 @@
 				名片信息
 			</view>
 			<u--form labelPosition="left" :model="cardInfo" ref="uForm">
-				<u-form-item label="名片标识" prop="userInfo.cardBusiness" borderBottom>
+				<u-form-item label="名片标识" prop="cardInfo.cardBusiness" borderBottom>
 					<u--input v-model="cardInfo.cardBusiness" border="none" placeholder="输入名片标识"></u--input>
 				</u-form-item>
-				<u-form-item label="姓名" prop="userInfo.name" borderBottom>
+				<u-form-item label="姓名" prop="cardInfo.name" borderBottom>
 					<u--input v-model="cardInfo.name" border="none" placeholder="输入姓名"></u--input>
 				</u-form-item>
-				<u-form-item label="职务" prop="userInfo.post" borderBottom>
+				<u-form-item label="职务" prop="cardInfo.post" borderBottom>
 					<u--input v-model="cardInfo.post" border="none" placeholder="输入职务,不超过8个字符"></u--input>
 				</u-form-item>
-				<u-form-item label="公司/机构名称" prop="userInfo.companyName" borderBottom>
+				<u-form-item label="公司/机构名称" prop="cardInfo.companyName" borderBottom>
 					<u--input v-model="cardInfo.companyName" border="none" placholder="输入公司/机构名称"></u--input>
 				</u-form-item>
 				</u-form-item>
@@ -47,13 +47,13 @@
 					<view @click="showPicker">选择地址</view>
 					<view>{{ province }}{{ city }}{{ area }}</view>
 				</u-form-item> -->
-				<u-form-item label="定位" prop="userInfo.name" borderBottom @click="placeSelect();hideKeyboard()">
+				<u-form-item label="定位" prop="cardInfo.name" borderBottom @click="placeSelect();hideKeyboard()">
 					<text>选择地址> </text>
 				</u-form-item>
-				<u-form-item label="详细地址" prop="userInfo.name" borderBottom>
+				<u-form-item label="详细地址" prop="cardInfo.name" borderBottom>
 					<u--input v-model="cardInfo.detailedAddress" border="none" placeholder="输入地址,不超过15个字"></u--input>
 				</u-form-item>
-				<u-form-item label="联系电话" prop="userInfo.name" borderBottom>
+				<u-form-item label="联系电话" prop="cardInfo.name" borderBottom>
 					<u--input v-model="cardInfo.phone" border="none" placeholder="输入联系电话"></u--input>
 				</u-form-item>
 			</u--form>
@@ -64,7 +64,7 @@
 			</view>
 			<view class="right">
 				<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
-					:maxCount="10"></u-upload>
+					:maxCount="1"></u-upload>
 			</view>
 		</view>
 		<view class="bottom">
@@ -185,7 +185,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.img {
 		width: 100rpx;
 	}