1

.gitignore

@@ -67,4 +67,8 @@ unimall.log.*.tmp
 ### plugins ###
 /plugins/
 /unimall-app/pages/plugins/
-/unimall-admin/src/views/plugins/
+/unimall-admin/src/views/plugins/
+
+### xcx ###
+.map/
+/unpackage/

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardManagementInfoService.java

@@ -19,11 +19,11 @@ import java.util.Date;
  */
 @HttpOpenApi(group = "admin.unimall.cardManagementInfo", description = "名片管理")
 public interface ICardManagementInfoService{
-	@HttpMethod(description = "新增", permission = "admin:unimall:cardManagementInfo:add", permissionParentName = "宠物管理", permissionName = "名片管理管理")
+	@HttpMethod(description = "新增", permissionName = "名片管理管理")
 	public Boolean add(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo,
 						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:unimall:cardManagementInfo:list",permissionParentName = "宠物管理", permissionName = "名片管理管理")
+	@HttpMethod(description = "列表", permissionName = "名片管理管理")
 	public Page<CardManagementInfo> list(
 								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,
 							@HttpParam(name = "cardBusiness", type = HttpParamType.COMMON, description = "名片标识") String cardBusiness,

unimall-admin/config/dev.env.js

@@ -1,6 +1,6 @@
 module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    HOST: '"http://localhost:8182"',
-    BASE_API: '"http://localhost:8182/m.api"'
+    HOST: '"http://192.168.110.67:8182"',
+    BASE_API: '"http://192.168.110.67:8182/m.api"'
 }

unimall-admin/config/index.js

@@ -25,7 +25,7 @@ module.exports = {
         // Use Eslint Loader?
         // If true, your code will be linted during bundling and
         // linting errors and warnings will be shown in the console.
-        useEslint: true,
+        useEslint: false,
         // If true, eslint errors and warnings will also be shown in the error overlay
         // in the browser.
         showEslintErrorsInOverlay: false,

unimall-admin/src/views/cardClassifyInfo/index.vue

@@ -186,7 +186,7 @@
 </template>
 
 <script>
-import { listCardClassifyInfo, getCardClassifyInfo, delCardClassifyInfo, addCardClassifyInfo, updateCardClassifyInfo, exportCardClassifyInfo } from "@/api/unimall/cardClassifyInfo";
+import { listCardClassifyInfo, getCardClassifyInfo, delCardClassifyInfo, addCardClassifyInfo, updateCardClassifyInfo, exportCardClassifyInfo } from "@/api/card/cardClassifyInfo";
 
 export default {
   data() {

unimall-admin/src/views/cardHolderInfo/index.vue

@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import { listCardHolderInfo, getCardHolderInfo, delCardHolderInfo, addCardHolderInfo, updateCardHolderInfo, exportCardHolderInfo } from "@/api/unimall/cardHolderInfo";
+import { listCardHolderInfo, getCardHolderInfo, delCardHolderInfo, addCardHolderInfo, updateCardHolderInfo, exportCardHolderInfo } from "@/api/card/cardHolderInfo";
 
 export default {
   data() {

unimall-admin/src/views/cardManagementInfo/index.vue

@@ -277,7 +277,7 @@
 </template>
 
 <script>
-import { listCardManagementInfo, getCardManagementInfo, delCardManagementInfo, addCardManagementInfo, updateCardManagementInfo, exportCardManagementInfo } from "@/api/unimall/cardManagementInfo";
+import { listCardManagementInfo, getCardManagementInfo, delCardManagementInfo, addCardManagementInfo, updateCardManagementInfo, exportCardManagementInfo } from "@/api/card/cardManagementInfo";
 
 export default {
   data() {

unimall-admin/src/views/certificateManagementInfo/index.vue

@@ -186,7 +186,7 @@
 </template>
 
 <script>
-import { listCertificateManagementInfo, getCertificateManagementInfo, delCertificateManagementInfo, addCertificateManagementInfo, updateCertificateManagementInfo, exportCertificateManagementInfo } from "@/api/unimall/certificateManagementInfo";
+import { listCertificateManagementInfo, getCertificateManagementInfo, delCertificateManagementInfo, addCertificateManagementInfo, updateCertificateManagementInfo, exportCertificateManagementInfo } from "@/api/card/certificateManagementInfo";
 
 export default {
   data() {

unimall-admin/src/views/circleCardInfo/index.vue

@@ -185,7 +185,7 @@
 </template>
 
 <script>
-import { listCircleCardInfo, getCircleCardInfo, delCircleCardInfo, addCircleCardInfo, updateCircleCardInfo, exportCircleCardInfo } from "@/api/unimall/circleCardInfo";
+import { listCircleCardInfo, getCircleCardInfo, delCircleCardInfo, addCircleCardInfo, updateCircleCardInfo, exportCircleCardInfo } from "@/api/card/circleCardInfo";
 
 export default {
   data() {

unimall-admin/src/views/circleManagementInfo/index.vue

@@ -188,7 +188,7 @@
 </template>
 
 <script>
-import { listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/unimall/circleManagementInfo";
+import { listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/card/circleManagementInfo";
 
 export default {
   data() {

unimall-admin/src/views/commonUserInfo/index.vue

@@ -249,7 +249,7 @@
 </template>
 
 <script>
-import { listCommonUserInfo, getCommonUserInfo, delCommonUserInfo, addCommonUserInfo, updateCommonUserInfo, exportCommonUserInfo } from "@/api/unimall/commonUserInfo";
+import { listCommonUserInfo, getCommonUserInfo, delCommonUserInfo, addCommonUserInfo, updateCommonUserInfo, exportCommonUserInfo } from "@/api/card/commonUserInfo";
 
 export default {
   data() {

unimall-admin/src/views/personalHomepageInfo/index.vue

@@ -237,7 +237,7 @@
 </template>
 
 <script>
-import { listPersonalHomepageInfo, getPersonalHomepageInfo, delPersonalHomepageInfo, addPersonalHomepageInfo, updatePersonalHomepageInfo, exportPersonalHomepageInfo } from "@/api/unimall/personalHomepageInfo";
+import { listPersonalHomepageInfo, getPersonalHomepageInfo, delPersonalHomepageInfo, addPersonalHomepageInfo, updatePersonalHomepageInfo, exportPersonalHomepageInfo } from "@/api/card/personalHomepageInfo";
 
 export default {
   data() {

unimall-admin/src/views/searchRecordsInfo/index.vue

@@ -184,7 +184,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/unimall/info";
+import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/card/info";
 
 export default {
   data() {

xiaochengxu/config/index.js

@@ -1,5 +1,5 @@
 const dev = {
-	baseUrlNew: 'http://192.168.110.82:8090',
+	baseUrlNew: 'http://192.168.110.67:8182',
 	// baseUrlNew: 'https://shiyaopinche.cspc.cn:10443',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

xiaochengxu/manifest.json

@@ -50,7 +50,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "",
+        "appid" : "wxa03b5fb231b72b08",
         "setting" : {
             "urlCheck" : false
         },

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -92,12 +92,63 @@
 			};
 		},
 		onShow() {
+			if (uni.getStorageSync("userInfo")) {
+				this.userInfo = uni.getStorageSync("userInfo")
+				this.init()
+			} else {
+				this.login()
+			}
 			this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
 		},
 		methods: {
-			toNotice(){
+			init(){
+				
+			},
+			login() {
+				let that = this
+				uni.login({
+					"provider": "weixin",
+					success: function(wxres) {
+						that.$request.baseRequest('commonUserApp', 'commonUserLogin', {
+							loginType: 1,
+							raw: JSON.stringify(wxres)
+						}, failres => {
+							this.$refs.uToast.show({
+								type: 'error',
+								message: failres.errmsg,
+							})
+							uni.hideLoading()
+						}).then(res => {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: function(info) {
+									console.log(info)
+									res.data.nickname = info.userInfo.nickName
+									res.data.head = info.userInfo.avatarUrl
+									that.$request.baseRequest('commonUserApp', 'edit', {
+										commonUserInfo: JSON.stringify(res.data)
+									}, failres => {
+										this.$refs.uToast.show({
+											type: 'error',
+											message: failres.errmsg,
+										})
+										uni.hideLoading()
+									}).then(res1 => {
+										uni.setStorageSync("userInfo",res1.data)
+									})
+								}
+							})
+						})
+					},
+					fail: function(err) {
+						// 登录授权失败  
+						// err.code是错误码
+					}
+				})
+			},
+			toNotice() {
 				uni.navigateTo({
-					url:"/pages/cardHolder/notice"
+					url: "/pages/cardHolder/notice"
 				})
 			},
 			micOpen: function() {
@@ -201,6 +252,7 @@
 
 	.content1 {
 		margin-top: 20rpx;
+
 		.search {
 			margin-left: 20rpx;
 			border: 1px solid #ccc;
@@ -218,8 +270,7 @@
 	}
 
 	.content2 {
-		.all-type {
-		}
+		.all-type {}
 	}
 
 	.content3 {
@@ -232,15 +283,15 @@
 			width: 30%;
 
 			.top {
-				
+
 				margin-bottom: 20rpx;
 			}
+
 			.img {
 				width: 80%;
 			}
 
-			.bottom {
-			}
+			.bottom {}
 		}
 
 		.right {

xiaochengxu/pages/mySet/myInfo.vue

@@ -66,7 +66,9 @@
 		},
 		methods:{
 			addCard(){
-				
+				uni.navigateTo({
+					url:"/pages/mySet/newCard"
+				})
 			}
 			// chooseImage(){
 			// 	uni.chooseImage({

xiaochengxu/pages/mySet/mySet.vue

@@ -2,9 +2,9 @@
 	<view class="content">
 		<view class="content1 flex-all-center relative">
 			<view class="user">
-				<image src="../../static/logo.png" mode="widthFix" class="img"></image>
+				<image :src="userInfo.head" mode="widthFix" class="img"></image>
 				<view class="name">
-					我是昵称
+					{{userInfo.nickname}}
 				</view>
 			</view>
 			<view class="position">
@@ -25,6 +25,7 @@
 	export default {
 		data() {
 			return {
+				userInfo:{},
 				menuList:[
 					{
 					name:"我的名片",
@@ -61,6 +62,10 @@
 				]
 			};
 		},
+		onShow() {
+			this.userInfo = uni.getStorageSync("userInfo")
+			console.log(this.userInfo )
+		},
 		methods:{
 			menuClick(typeName){
 				let _url = '/pages/mySet/'+typeName

xiaochengxu/pages/mySet/newCard.vue

@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<view class="change-template">
-			<切换模板>
+			切换模板
 		</view>
 		<view class="content2">
 			<view class="">