wesmiler 6 anos atrás
pai
commit
7edd7287f1

+ 4 - 4
public/static/weixin/css/shop-map.css

@@ -25,13 +25,13 @@
 
     position: relative;
 
-    background-color: #956bff;
+    background-color: #b9b7bf;
 
     color: #fff;
 }
 
 .info.active {
-    background-color: #815cdc;
+    background-color: #a8a6ad;
     z-index: 998 !important;
 }
 
@@ -55,11 +55,11 @@
 }
 
 .shop-business {
-    background-color: #b9b7bf;
+    background-color: #956bff;
 }
 
 .shop-business.active {
-    background-color: #a8a6ad;
+    background-color: #815cdc;
 }
 
 /*

+ 2 - 1
public/static/weixin/js/shop-map.js

@@ -247,9 +247,10 @@ var app = new Vue({
                     var address = data.d_address ? data.d_address : (data.address? data.address : '无');
                     var shop_name = data.shop_name ? '('+data.shop_name+')' : '';
                     var device_code = data.show_device_code? "<div class='item address'>设备号:" + data.device_code + "</div>" : '';
+                    var business = data.business? "<div class='item address'>营业时间:" + data.service_time + "</div>" : "<div class='item address'>营业时间:暂停营业</div>";
                     $.modal({
                         title: '设备[' + data.device_name + ']',
-                        text: device_code+"<div class='item'>打印机类型:"+colorType+"</div><div class='item mobile'>联系方式:<a href='tel:" + mobile + "'>联系店家"+shop_name+"</a></div><div class='item address'>店铺地址:" + address + "</div><div class='intro'>店铺介绍:" + intro + "</div>",
+                        text: device_code+business+"<div class='item'>打印机类型:"+colorType+"</div><div class='item mobile'>联系方式:<a href='tel:" + mobile + "'>联系店家"+shop_name+"</a></div><div class='item address'>店铺地址:" + address + "</div><div class='intro'>店铺介绍:" + intro + "</div>",
                         buttons: [
                             {
                                 text: "取消",