fix

virgo.wzfrontend/workark_wx/main.js

@@ -36,11 +36,11 @@ Vue.prototype.initBadge = () => {
 		let badge = uni.getStorageSync('chatBadge');
 		if (badge === '0') {
 			uni.removeTabBarBadge({
-				index: 3
+				index: 1
 			})
 		} else {
 			uni.setTabBarBadge({
-				index: 3,
+				index: 1,
 				text: badge
 			})
 		}

virgo.wzfrontend/workark_wx/pages.json

@@ -195,10 +195,10 @@
 			"selectedIconPath": "static/images/tabbar/home-active.png",
 			"text": "工单"
 		}, {
-			"pagePath": "pages/model/model",
-			"iconPath": "/static/images/tabbar/shop.png",
-			"selectedIconPath": "/static/images/tabbar/shop-active.png",
-			"text": "环境"
+			"pagePath": "pages/message/message",
+			"iconPath": "/static/images/tabbar/chat.png",
+			"selectedIconPath": "/static/images/tabbar/chat-active.png",
+			"text": "消息"
 		}, {
 			"pagePath": "pages/workark/workark",
 			"iconPath": "/static/images/tabbar/workark.png",
@@ -206,8 +206,8 @@
 			"text": "workark"
 		}, {
 			"pagePath": "pages/shop/shop",
-			"iconPath": "static/images/tabbar/chat.png",
-			"selectedIconPath": "static/images/tabbar/chat-active.png",
+			"iconPath": "static/images/tabbar/shop.png",
+			"selectedIconPath": "/static/images/tabbar/shop-active.png",
 			"text": "商城"
 		}, {
 			"pagePath": "pages/my/my",

virgo.wzfrontend/workark_wx/pages/my/my.vue

@@ -13,7 +13,7 @@
 			<view class="my-list">
 				<view class="my-list-box">
 					<view class="my-item" @tap="$navigateTo('/subPages/shopPage/orderList/orderList')">
-						<view class="my-icon bg3">
+						<view class="my-icon bg1">
 							<uv-icon name="order" color="#fff" size="28"></uv-icon>
 						</view>
 						<view class="item-content">
@@ -23,6 +23,17 @@
 							<uv-icon name="arrow-right" color="#c1c0c8" size="16"></uv-icon>
 						</view>
 					</view>
+					<view class="my-item" @tap="$navigateTo('/subPages/shopPage/addressList/addressList')">
+						<view class="my-icon bg2">
+							<uv-icon name="empty-address" color="#fff" size="28"></uv-icon>
+						</view>
+						<view class="item-content">
+							收货地址
+						</view>
+						<view class="my-forward">
+							<uv-icon name="arrow-right" color="#c1c0c8" size="16"></uv-icon>
+						</view>
+					</view>
 					<view class="my-item" @tap="$navigateTo('/subPages/myPage/organization/organization')">
 						<view class="my-icon bg3">
 							<uv-icon name="home" color="#fff" size="28"></uv-icon>

virgo.wzfrontend/workark_wx/subPages/shopPage/addressAdd/addressAdd.vue

@@ -44,7 +44,8 @@
 	import {
 		getAddressDetail,
 		saveAddress,
-		setDefaultAddress
+		setDefaultAddress,
+		deleteAddress
 	} from '@/request/api/shop.js'
 	import cityData from '../static/js/city.js';
 	export default {
@@ -82,7 +83,8 @@
 			} else {
 				this.id = ''
 				//显示默认的地区
-				this.defaultRegion = ["11", "1101", "110101"]
+				this.defaultRegion = ["11", "1101", "110101"];
+				this.getData();
 			}
 		},
 		methods: {
@@ -164,12 +166,21 @@
 					uni.navigateBack();
 				}
 			},
-			async del() {
-				let deleteData = await deleteAddress(this.address.id);
-				if (deleteData.state) {
-					this.$toast('操作成功');
-					uni.navigateBack();
-				}
+			del() {
+				uni.showModal({
+					title: 'WORKARK提示',
+					content: '是否取消该地址',
+					success: async (res) => {
+						if (res.confirm) {
+							let deleteData = await deleteAddress(this.address.id);
+							if (deleteData.state) {
+								this.$toast('操作成功');
+								uni.navigateBack();
+							}
+						}
+					}
+				});
+
 			}
 		}
 	};

virgo.wzfrontend/workark_wx/subPages/shopPage/addressList/addressList.vue

@@ -46,7 +46,6 @@
 		onLoad(option) {
 			if (option.choose) this.choose = true;
 			if (option.chooseAddrId) this.chooseAddrId = Number(option.chooseAddrId);
-			console.log(this.chooseAddrId);
 		},
 		onShow() {
 			this.init()
@@ -79,6 +78,7 @@
 			width: 100%;
 			padding: 40rpx 20rpx;
 			background: #ffffff;
+			margin-bottom: 2rpx;
 
 			.top {
 				display: flex;
@@ -108,7 +108,7 @@
 					}
 
 					.red {
-						background-color: red
+						background-color: $uv-error;
 					}
 				}
 			}
@@ -130,7 +130,7 @@
 			position: absolute;
 			bottom: 60rpx;
 			left: 80rpx;
-			background-color: red;
+			background-color: $uv-error;
 			border-radius: 40rpx;
 			font-size: 30rpx;
 

virgo.wzfrontend/workark_wx/uitls/chat.js

@@ -192,11 +192,11 @@ const $chat = {
 				uni.setStorageSync('chatBadge', String(badge));
 				if (!badge) {
 					uni.removeTabBarBadge({
-						index: 3
+						index: 1
 					})
 				} else {
 					uni.setTabBarBadge({
-						index: 3,
+						index: 1,
 						text: String(badge)
 					})
 				}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -78,10 +78,10 @@
         "text": "工单"
       },
       {
-        "pagePath": "pages/model/model",
-        "iconPath": "/static/images/tabbar/shop.png",
-        "selectedIconPath": "/static/images/tabbar/shop-active.png",
-        "text": "环境"
+        "pagePath": "pages/message/message",
+        "iconPath": "/static/images/tabbar/chat.png",
+        "selectedIconPath": "/static/images/tabbar/chat-active.png",
+        "text": "消息"
       },
       {
         "pagePath": "pages/workark/workark",
@@ -91,8 +91,8 @@
       },
       {
         "pagePath": "pages/shop/shop",
-        "iconPath": "static/images/tabbar/chat.png",
-        "selectedIconPath": "static/images/tabbar/chat-active.png",
+        "iconPath": "static/images/tabbar/shop.png",
+        "selectedIconPath": "/static/images/tabbar/shop-active.png",
         "text": "商城"
       },
       {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/main.js

@@ -49,11 +49,11 @@ _vue.default.prototype.initBadge = function () {
     var badge = uni.getStorageSync('chatBadge');
     if (badge === '0') {
       uni.removeTabBarBadge({
-        index: 3
+        index: 1
       });
     } else {
       uni.setTabBarBadge({
-        index: 3,
+        index: 1,
         text: badge
       });
     }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -27715,11 +27715,11 @@ var $chat = {
         uni.setStorageSync('chatBadge', String(badge));
         if (!badge) {
           uni.removeTabBarBadge({
-            index: 3
+            index: 1
           });
         } else {
           uni.setTabBarBadge({
-            index: 3,
+            index: 1,
             text: String(badge)
           });
         }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -235,6 +235,17 @@ var _my = __webpack_require__(/*! @/request/api/my.js */ 124);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/addressAdd/addressAdd.js

@@ -256,6 +256,7 @@ var _default = {
       this.id = '';
       //显示默认的地区
       this.defaultRegion = ["11", "1101", "110101"];
+      this.getData();
     }
   },
   methods: {
@@ -400,27 +401,41 @@ var _default = {
     },
     del: function del() {
       var _this5 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var deleteData;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return deleteAddress(_this5.address.id);
-              case 2:
-                deleteData = _context4.sent;
-                if (deleteData.state) {
-                  _this5.$toast('操作成功');
-                  uni.navigateBack();
+      uni.showModal({
+        title: 'WORKARK提示',
+        content: '是否取消该地址',
+        success: function () {
+          var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
+            var deleteData;
+            return _regenerator.default.wrap(function _callee4$(_context4) {
+              while (1) {
+                switch (_context4.prev = _context4.next) {
+                  case 0:
+                    if (!res.confirm) {
+                      _context4.next = 5;
+                      break;
+                    }
+                    _context4.next = 3;
+                    return (0, _shop.deleteAddress)(_this5.address.id);
+                  case 3:
+                    deleteData = _context4.sent;
+                    if (deleteData.state) {
+                      _this5.$toast('操作成功');
+                      uni.navigateBack();
+                    }
+                  case 5:
+                  case "end":
+                    return _context4.stop();
                 }
-              case 4:
-              case "end":
-                return _context4.stop();
-            }
+              }
+            }, _callee4);
+          }));
+          function success(_x) {
+            return _success.apply(this, arguments);
           }
-        }, _callee4);
-      }))();
+          return success;
+        }()
+      });
     }
   }
 };

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/addressList/addressList.js

@@ -224,7 +224,6 @@ var _default = {
   onLoad: function onLoad(option) {
     if (option.choose) this.choose = true;
     if (option.chooseAddrId) this.chooseAddrId = Number(option.chooseAddrId);
-    console.log(this.chooseAddrId);
   },
   onShow: function onShow() {
     this.init();

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/addressList/addressList.wxss

@@ -5,6 +5,7 @@
   width: 100%;
   padding: 40rpx 20rpx;
   background: #ffffff;
+  margin-bottom: 2rpx;
 }
 .wrap .item .top.data-v-4a3f87d0 {
   display: flex;
@@ -32,7 +33,7 @@
   background-color: #3191fd;
 }
 .wrap .item .top .tag .red.data-v-4a3f87d0 {
-  background-color: red;
+  background-color: #f56c6c;
 }
 .wrap .item .bottom.data-v-4a3f87d0 {
   display: flex;
@@ -49,7 +50,7 @@
   position: absolute;
   bottom: 60rpx;
   left: 80rpx;
-  background-color: red;
+  background-color: #f56c6c;
   border-radius: 40rpx;
   font-size: 30rpx;
 }