首页 发现 帮助
注册 登录
wangchao
/
businessCard
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

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

高敬炎 2 年之前
父节点
8fbf34641b 21040aafbd
当前提交
3dc2d5cb27
共有 11 个文件被更改，包括 104 次插入 和 42 次删除
分列视图 显示文件统计
  1. 2 2
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java
  2. 1 1
      unimall-admin/config/index.js
  3. 2 2
      unimall-admin/config/prod.env.js
  4. 1 1
      unimall-admin/index.html
  5. 36 16
      unimall-admin/src/views/commonUserInfo/index.vue
  6. 2 2
      unimall-admin/src/views/layout/components/Navbar.vue
  7. 1 1
      unimall-admin/src/views/login/index.vue
  8. 2 2
      xiaochengxu/config/index.js
  9. 13 6
      xiaochengxu/pages/cardHolder/cardHolder.vue
  10. 44 9
      xiaochengxu/pages/cardHolder/map.vue
  11. 二进制
      xiaochengxu/static/location.png

+ 2 - 2
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java
查看文件 

@@ -54,8 +54,8 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 
         //更新数据库默认值
 
         cardManagementInfo = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
 
         //二维码
 
-        String str = qrCodeUtil.getQRCodeImage(String.valueOf(cardManagementInfo.getId()), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
-        String str1 = qrCodeUtil.getQRCodeImage(cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
+        String str = qrCodeUtil.getQRCodeImage("http://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
+        String str1 = qrCodeUtil.getQRCodeImage("http://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
         cardManagementInfo.setQrCode(str);
 
         cardManagementInfo.setQrCodeMyself(str1);
 
         return cardManagementInfoMapper.updateById(cardManagementInfo) > 0;

+ 1 - 1
unimall-admin/config/index.js
查看文件 

@@ -15,7 +15,7 @@ module.exports = {
 
 
         // can be overwritten by process.env.HOST
 
         // if you want dev by ip, please set host: '0.0.0.0'
 
-        host: 'localhost',
 
+        host: '192.168.110.82',
 
         port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
 
         autoOpenBrowser: true,
 
         errorOverlay: true,

+ 2 - 2
unimall-admin/config/prod.env.js
查看文件 

@@ -1,6 +1,6 @@
 
 module.exports = {
 
 	NODE_ENV: '"production"',
 
   	ENV_CONFIG: '"prod"',
 
-    HOST: '"http://106.14.75.12:8181"',
 
-    BASE_API: '"http://106.14.75.12:8181/m.api"'
 
+    HOST: '"https://cardapi.eliangeyun.com"',
 
+    BASE_API: '"https://cardapi.eliangeyun.com/m.api"'
 
 }

+ 1 - 1
unimall-admin/index.html
查看文件 

@@ -5,7 +5,7 @@
 
     <meta charset="utf-8">
 
     <meta name="renderer" content="webkit">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-    <title>电商后台管理</title>
 
+    <title>名片后台管理</title>
 
 </head>
 
 
 <body>

+ 36 - 16
unimall-admin/src/views/commonUserInfo/index.vue
查看文件 

@@ -302,6 +302,13 @@ export default {
 
   methods: {
 
     sendMsg() {
 
 
+
 
+      this.cardNewsInfo = {}
 
+      this.msgObj = {
 
+        newsTitle: '',
 
+        newsContent: '',
 
+      }
 
+      this.selectList = []
 
       this.isShowMsg = true
 
     },
 
     /** 查询用户管理列表 */
 
@@ -314,26 +321,39 @@ export default {
 
       });
 
     },
 
     submitMsg() {
 
-      let _array = []
 
-      if (this.selectList.length == 0) {
 
-        this.msgObj.allFlag = 1
 
-      } else {
 
-        this.msgObj.cardNewsInfoList = []
 
-        for (let i = 0; i < this.selectList.length; i++) {
 
-          _array.push({ receiveId: this.selectList[i].id })
 
-        }
 
-        this.msgObj.cardNewsInfoList = _array
 
-      }
 
-      userSendMsg(this.msgObj).then(response => {
 
-        console.log("response", response)
 
-        if (response.data) {
 
-          this.msgSuccess("发送成功");
 
-          this.isShowMsg = false;
 
+      let that = this
 
+      this.$confirm('确定发送消息', '提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning'
 
+      }).then(() => {
 
+        let _array = []
 
+        if (this.selectList.length == 0) {
 
+          this.msgObj.allFlag = 1
 
         } else {
 
-          this.msgError(response.msg);
 
+          this.msgObj.cardNewsInfoList = []
 
+          for (let i = 0; i < this.selectList.length; i++) {
 
+            _array.push({ receiveId: this.selectList[i].id })
 
+          }
 
+          this.msgObj.cardNewsInfoList = _array
 
         }
 
+        userSendMsg(this.msgObj).then(response => {
 
+          console.log("response", response)
 
+          if (response.data) {
 
+            this.msgSuccess("发送成功");
 
+            this.isShowMsg = false;
 
+          } else {
 
+            this.msgError(response.msg);
 
+          }
 
 
+        });
 
+      }).catch(() => {
 
+        this.$message({
 
+          type: 'info',
 
+          message: '已取消'
 
+        });
 
       });
 
+
 
     },
 
     cancelMsg() {
 
       this.isShowMsg = false;

+ 2 - 2
unimall-admin/src/views/layout/components/Navbar.vue
查看文件 

@@ -79,8 +79,8 @@ export default {
 
     },
 
     logout() {
 
       this.$store.dispatch('LogOut').then(() => {
 
-        window.location.href = 'http://106.14.75.12:9999/'
 
-        // location.reload() // In order to re-instantiate the vue-router object to avoid bugs
 
+        // window.location.href = 'http://106.14.75.12:9999/'
 
+        location.reload() // In order to re-instantiate the vue-router object to avoid bugs
 
       })
 
     }
 
   }

+ 1 - 1
unimall-admin/src/views/login/index.vue
查看文件 

@@ -11,7 +11,7 @@
 
           class="img"
 
           src="@/assets/avatar.png"
 
           alt="">
 
-        <p class="title">电商后台登录</p>
 
+        <p class="title">名片后台登录</p>
 
       </div>
 
       <div class="login-border">
 
         <div class="login-main">

+ 2 - 2
xiaochengxu/config/index.js
查看文件 

@@ -1,8 +1,8 @@
 
 const dev = {
 
 	// baseUrlNew: 'http://192.168.110.72:8182',
 
-	baseUrlNew: 'http://192.168.110.138:8182',
 
+	// baseUrlNew: 'http://192.168.110.138:8182',
 
 	// baseUrlNew: 'http://192.168.110.82:8182',
 
-	// baseUrlNew: 'https://shiyaopinche.cspc.cn:10443',
 
+	baseUrlNew: 'https://cardapi.eliangeyun.com',
 
 	h5Appid: 'wxb66b599f7f61b46f',
 
 	debug: false
 
 }

+ 13 - 6
xiaochengxu/pages/cardHolder/cardHolder.vue
查看文件 

@@ -360,6 +360,11 @@
 
 			};
 
 		},
 
 		onShow() {
 
+		},
 
+		mounted() {
 
+
 
+		},
 
+		onLoad: function(options) {
 
 			console.log(uni.getLaunchOptionsSync().scene, 1011)
 
 			if (uni.getStorageSync("userInfo").phone) {
 
 				this.userInfo = uni.getStorageSync("userInfo")
 
@@ -375,12 +380,6 @@
 
 					this.login()
 
 				}
 
 			}
 
-
 
-		},
 
-		mounted() {
 
-
 
-		},
 
-		onLoad: function(options) {
 
 			this.status = uni.getLaunchOptionsSync().scene
 
 			if (uni.getLaunchOptionsSync().scene == 1154) {
 
 				uni.showToast({
 
@@ -419,6 +418,9 @@
 
 			}
 
 		},
 
 		methods: {
 
+			downCallback(){
 
+				this.mescroll.resetUpScroll()
 
+			},
 
 			freeTell(item) {
 
 				uni.makePhoneCall({
 
 					phoneNumber: item.phone, //仅为示例，并非真实的电话号码
 
@@ -969,6 +971,7 @@
 
 					})
 
 				} else {
 
 					this.typeName = e.value[0].circleName
 
+					if(this.typeName =="全部分类") this.typeName = ''
 
 					this.mescroll.resetUpScroll()
 
 				}
 
 				this.isShowType = false
 
@@ -1029,7 +1032,11 @@
 
 							message: failres.errmsg,
 
 						})
 
 					}).then(res => {
 
+						res.data.items.unshift({
 
+							circleName:'全部分类'
 
+						})
 
 						this.typeColumns = [res.data.items]
 
+						
 						console.log(this.typeColumns)
 
 					})

+ 44 - 9
xiaochengxu/pages/cardHolder/map.vue
查看文件 

@@ -3,7 +3,18 @@
 
 		<view class="page-body">
 
 			<view class="page-section page-section-gap">
 
 				<map style="width: 100%; height: 100vh;" :latitude="latitude" :longitude="longitude" :markers="covers">
 
+				<cover-view class="cover-view">
 
+				          <cover-view class="container">
 
+				            <cover-view class="flex-wrp" style="flex-direction:row;">
 
+				              <cover-view class="flex-item demo-text-1">
 
+								  <cover-view style="font-weight: bold;">黑龙江中天昊元贸易有限公司</cover-view>
 
+								   <cover-view style="margin-top: 20rpx;color: #ccc;font-size: 26rpx;display: flex;align-items: center;"><image src="../../static/location.png" mode="widthFix" style="width: 20px;margin-right: 20rpx;"></image>辽宁省营口市皱鱼圈区青龙山大街8号</cover-view>
 
+							  </cover-view>
 
+				            </cover-view>
 
+				          </cover-view>
 
+				        </cover-view>
 
 				</map>
 
+				
 			</view>
 
 		</view>
 
 	</view>
 
@@ -16,21 +27,22 @@
 
 				title: 'map',
 
 				latitude: 39.909,
 
 				longitude: 116.39742,
 
-				covers: [{
 
-					latitude: 39.909,
 
-					longitude: 116.39742,
 
-					// iconPath: '../../../static/location.png'
 
-				}, {
 
-					latitude: 39.90,
 
-					longitude: 116.39,
 
-					// iconPath: '../../../static/location.png'
 
-				}]
 
+				covers: []
 
 			}
 
 		},
 
 		onLoad(options) {
 
 			var location=options.location.split(',')
 
 			this.latitude=location[0]
 
 			this.longitude=location[1]
 
+			this.covers = [
 
+				{
 
+					latitude: this.latitude,
 
+					longitude: this.longitude,
 
+					width:34,
 
+					height:40,
 
+					iconPath: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/marker.png'
 
+				}
 
+			]
 
 		},
 
 		methods: {
 
 	
@@ -39,5 +51,28 @@
 
 </script>
 
 
 <style lang="scss">
 
+.cover-view {
 
+  position: absolute;
 
+  bottom: 80rpx;
 
+  left:20rpx;
 
+  /* opacity: .7; */
 
+}
 
+
 
+.flex-wrp{
 
+  display:flex;
 
+}
 
+
 
+.flex-item{
 
+  width: calc(100vw - 40rpx);
 
+  height: 140rpx;
 
+  font-size: 26rpx;
 
+}
 
+
 
+.demo-text-1 {
 
+  background: #fff;
 
+  border-radius: 20rpx;
 
+  padding: 20rpx 40rpx;
 
+  box-sizing: border-box;
 
+}
 
 
 </style>

二进制
xiaochengxu/static/location.png
查看文件