achao 2 лет назад
Родитель
Сommit
21040aafbd

+ 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,

+ 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;

+ 5 - 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({

+ 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>

BIN
xiaochengxu/static/location.png