小程序仓库适配多商户优化

sourcecode/alipay/default/app.js

@@ -961,4 +961,59 @@ App({
     return uuid;
   },
 
+  // 链接地址事件
+  url_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var temp = value.substr(0, 6);
+      if(temp == 'http:/' || temp == 'https:')
+      {
+        this.open_web_view(value);
+      } else {
+        if (this.is_tabbar_pages(value))
+        {
+          my.switchTab({ url: value });
+        } else {
+          my.navigateTo({ url: value });
+        }
+      }
+    }
+  },
+
+  // 剪贴板
+  text_copy_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var self = this;
+      my.setClipboardData({
+        data: value,
+        success (res) {
+          my.getClipboardData({
+            success (res) {
+              self.showToast('复制成功', 'success');
+            }
+          });
+        }
+      });
+    } else {
+      this.showToast('复制内容为空');
+    }
+  },
+
+  // 图片预览
+  image_show_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      my.previewImage({
+        current: 0,
+        urls: [value]
+      });
+    } else {
+      this.showToast('图片地址为空');
+    }
+  },
+
 });

sourcecode/alipay/default/pages/buy/buy.acss

@@ -50,6 +50,10 @@
 .goods-group-hd {
   padding: 20rpx 0;
 }
+.goods-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .goods-group-title {
   font-weight: bold;
   vertical-align: middle;

sourcecode/alipay/default/pages/buy/buy.axml

@@ -36,11 +36,12 @@
     <view class="goods-group-list bg-white spacing-mb" a:for="{{goods_list}}" a:for-item="group">
       <!-- 仓库分组 -->
       <view class="goods-group-hd oh br-b">
-        <view class="fl">
-          <text class="goods-group-title">{{group.name}}</text>
-          <text a:if="{{(group.alias || null) != null}}" class="goods-group-alias">{{group.alias}}</text>
+        <view class="fl" onTap="warehouse_group_event" data-value="{{group.url || ''}}">
+          <image a:if="{{(group.icon || null) != null}}" class="goods-group-icon va-m margin-right-xs" src="{{group.icon}}" mode="aspectFit" />
+          <text class="goods-group-title va-m">{{group.name}}</text>
+          <text a:if="{{(group.alias || null) != null}}" class="goods-group-alias va-m">{{group.alias}}</text>
         </view>
-        <view a:if="{{(group.lng || null) != null && (group.lat || null) != null}}" class="fr">
+        <view a:if="{{(group.lng || null) != null && (group.lat || null) != null && group.lng != 0 && group.lat != 0}}" class="fr">
           <view class="goods-group-map-submit br" data-index="{{index}}" onTap="map_event">查看地图</view>
         </view>
       </view>

sourcecode/alipay/default/pages/buy/buy.js

@@ -403,4 +403,9 @@ Page({
     this.setData({plugins_points_status: !this.data.plugins_points_status});
     this.init();
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });

sourcecode/alipay/default/pages/extraction-address/extraction-address.axml

@@ -23,7 +23,7 @@
           <text class="cr-666">{{item.distance_value}}</text>
           <text class="cr-888">{{item.distance_unit}}</text>
         </view>
-        <button a:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="fr cr-666 map-submit br" type="default" size="mini" onTap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+        <button a:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="fr cr-666 map-submit br" type="default" size="mini" onTap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
       </view>
     </view>
   </view>

sourcecode/alipay/default/pages/goods-detail/goods-detail.acss

@@ -198,9 +198,9 @@
   border-left: 1px solid #e1e1e1;
 }
 .goods-buy-nav .fl image {
-  width: 25px;
-  height: 25px;
-  margin: 0 auto;
+  width: 20px;
+  height: 20px;
+  margin: 5rpx 0;
 }
 .goods-title {
   font-size: 32rpx;

sourcecode/alipay/default/pages/goods-detail/goods-detail.axml

@@ -177,7 +177,7 @@
   <!-- 底部操作 -->
   <view class="goods-buy-nav wh-auto bg-white">
     <view class="shop fl tc br-t" onTap="shop_event">
-      <image src="/images/goods-detail-home-icon.png" mode="scaleToFill" />
+      <image src="/images/default-home-icon.png" mode="scaleToFill" />
       <text class="dis-block cr-888">首页</text>
     </view>
     <view class="collect fl tc br-t" onTap="goods_favor_event">

sourcecode/alipay/default/pages/goods-detail/goods-detail.js

@@ -19,7 +19,7 @@ Page({
 
     popup_status: false,
     goods_favor_text: '收藏',
-    goods_favor_icon: '/images/goods-detail-favor-icon-0.png',
+    goods_favor_icon: '/images/default-favor-icon-0.png',
     temp_buy_number: 1,
     buy_event_type: 'buy',
     buy_button: {},
@@ -152,7 +152,7 @@ Page({
               goods_content_app: data.goods.content_app || [],
               temp_buy_number: data.goods.buy_min_number || 1,
               goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
-              goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
+              goods_favor_icon: '/images/default-favor-icon-' + data.goods.is_favor+'.png',
               buy_button: data.buy_button || null,
               
               goods_spec_base_price: data.goods.price,
@@ -316,7 +316,7 @@ Page({
               this.setData({
                 'goods.is_favor': res.data.data.status,
                 goods_favor_text: res.data.data.text,
-                goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
+                goods_favor_icon: '/images/default-favor-icon-'+res.data.data.status+'.png'
               });
               app.showToast(res.data.msg, 'success');
             } else {

sourcecode/alipay/default/pages/plugins/distribution/extraction-switch/extraction-switch.axml

@@ -26,7 +26,7 @@
         <view class="fr oh button-list">
           <button a:if="{{(item.is_default || 0) == 0}}" class="cr-666 map-submit br" type="default" size="mini" onTap="address_switch_event" data-index="{{index}}" hover-class="none">选择</button>
           <button a:else class="cr-ccc map-submit br-main" type="default" size="mini" hover-class="none" disabled="{{true}}">默认</button>
-          <button a:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 map-submit br" type="default" size="mini" onTap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+          <button a:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 map-submit br" type="default" size="mini" onTap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
         </view>
       </view>
     </view>

sourcecode/alipay/default/pages/user-address/user-address.axml

@@ -19,7 +19,7 @@
           <text>设为默认地址</text>
         </view>
         <view class="fr oh submit-items">
-          <button a:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 br" type="default" size="mini" onTap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
+          <button a:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 br" type="default" size="mini" onTap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
           <button class="cr-666 br" type="default" size="mini" onTap="address_edit_event" data-index="{{index}}" hover-class="none">编辑</button>
           <button class="cr-666 br" type="default" size="mini" onTap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
         </view>

sourcecode/alipay/default/pages/user-order-detail/user-order-detail.axml

@@ -10,7 +10,7 @@
           <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
           <view class="text fr">
             {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
-            <text a:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null) != null}}" class="cr-666 br address-map-submit" onTap="address_map_event">查看位置</text>
+            <text a:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null) != null && detail.address_data.lng != 0 && detail.address_data.lat != 0}}" class="cr-666 br address-map-submit" onTap="address_map_event">查看位置</text>
           </view>
       </view>
   </view>

sourcecode/alipay/default/pages/user-order/user-order.acss

@@ -50,6 +50,10 @@
 .item-base, .item-describe, .item-operation {
     padding: 20rpx 10rpx 20rpx 10rpx;
 }
+.warehouse-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .submit-cancel {
     border: 1px solid #f7c3b3;
     color: #f7c3b3;

sourcecode/alipay/default/pages/user-order/user-order.axml

@@ -16,7 +16,10 @@
           <image class="icon" src="/images/default-select{{order_select_ids.indexOf(item.id) != -1 ? '-active' : ''}}-icon.png" mode="widthFix" />
         </view>
         <!-- 基础信息 -->
-        <text class="fl cr-666">{{item.warehouse_name}}</text>
+        <view class="fl" onTap="warehouse_group_event" data-value="{{item.warehouse_url || ''}}">
+          <image a:if="{{(item.warehouse_icon || null) != null}}" class="warehouse-group-icon va-m margin-right-xs" src="{{item.warehouse_icon}}" mode="aspectFit" />
+          <text class="cr-666 va-m">{{item.warehouse_name}}</text>
+        </view>
         <text class="fr cr-main">{{item.status_name}}<text a:if="{{(item.is_under_line_text || null) != null}}">（{{item.is_under_line_text}}）</text></text>
       </view>
       <view a:for="{{item.items}}" a:for-item="detail" class="goods-item br-b-dashed oh">

sourcecode/alipay/default/pages/user-order/user-order.js

@@ -501,4 +501,9 @@ Page({
       temp_pay_value: this.data.order_select_ids.join(',')
     });
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });

sourcecode/baidu/default/app.js

@@ -895,6 +895,61 @@ App({
     }
 
     return uuid;
-  }
+  },
+
+  // 链接地址事件
+  url_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var temp = value.substr(0, 6);
+      if(temp == 'http:/' || temp == 'https:')
+      {
+        this.open_web_view(value);
+      } else {
+        if (this.is_tabbar_pages(value))
+        {
+          swan.switchTab({ url: value });
+        } else {
+          swan.navigateTo({ url: value });
+        }
+      }
+    }
+  },
+
+  // 剪贴板
+  text_copy_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var self = this;
+      swan.setClipboardData({
+        data: value,
+        success (res) {
+          swan.getClipboardData({
+            success (res) {
+              self.showToast('复制成功', 'success');
+            }
+          });
+        }
+      });
+    } else {
+      this.showToast('复制内容为空');
+    }
+  },
+
+  // 图片预览
+  image_show_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      swan.previewImage({
+        current: value,
+        urls: [value]
+      });
+    } else {
+      this.showToast('图片地址为空');
+    }
+  },
 
 });
\ No newline at end of file

sourcecode/baidu/default/pages/buy/buy.css

@@ -50,6 +50,10 @@
 .goods-group-hd {
   padding: 20rpx 0;
 }
+.goods-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .goods-group-title {
   font-weight: bold;
   vertical-align: middle;

sourcecode/baidu/default/pages/buy/buy.js

@@ -383,4 +383,9 @@ Page({
     this.setData({plugins_points_status: !this.data.plugins_points_status});
     this.init();
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });
\ No newline at end of file

sourcecode/baidu/default/pages/buy/buy.swan

@@ -36,11 +36,12 @@
       <view class="goods-group-list bg-white spacing-mb" s-for="group, index in goods_list" s-key="key">
         <!-- 仓库分组 -->
         <view class="goods-group-hd oh br-b">
-          <view class="fl">
-            <text class="goods-group-title">{{group.name}}</text>
-            <text s-if="(group.alias || null) != null" class="goods-group-alias">{{group.alias}}</text>
+          <view class="fl" bindtap="warehouse_group_event" data-value="{{group.url || ''}}">
+            <image s-if="(group.icon || null) != null" class="goods-group-icon va-m margin-right-xs" src="{{group.icon}}" mode="aspectFit" />
+            <text class="goods-group-title va-m">{{group.name}}</text>
+            <text s-if="(group.alias || null) != null"" class="goods-group-alias va-m">{{group.alias}}</text>
           </view>
-          <view s-if="(group.lng || null) != null && (group.lat || null) != null" class="fr">
+          <view s-if="(group.lng || null) != null && (group.lat || null) != null && group.lng != 0 && group.lat != 0" class="fr">
             <view class="goods-group-map-submit br" data-index="{{index}}" bindtap="map_event">查看地图</view>
           </view>
         </view>

sourcecode/baidu/default/pages/extraction-address/extraction-address.swan

@@ -23,7 +23,7 @@
           <text class="cr-666">{{item.distance_value}}</text>
           <text class="cr-888">{{item.distance_unit}}</text>
         </view>
-        <button s-if="(item.lng || null) != null && (item.lat || null) != null" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+        <button s-if="(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
       </view>
     </view>
   </view>

sourcecode/baidu/default/pages/goods-detail/goods-detail.css

@@ -196,9 +196,14 @@
 .goods-buy-nav-btn-number-10 button {
   width: 10% !important;
 }
-.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
-.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
-
+.goods-buy-nav .collect {
+  border-left: 1px solid #e1e1e1;
+}
+.goods-buy-nav .fl image {
+  width: 20px;
+  height: 20px;
+  margin: 5rpx 0;
+}
 .goods-buy-nav .dis-block {
   margin-top: -10rpx;
 }

sourcecode/baidu/default/pages/goods-detail/goods-detail.js

@@ -17,7 +17,7 @@ Page({
     goods_content_app: [],
     popup_status: false,
     goods_favor_text: '收藏',
-    goods_favor_icon: '/images/goods-detail-favor-icon-0.png',
+    goods_favor_icon: '/images/default-favor-icon-0.png',
     temp_buy_number: 1,
     buy_event_type: 'buy',
     buy_button: {},
@@ -136,7 +136,7 @@ Page({
               goods_content_app: data.goods.content_app || [],
               temp_buy_number: data.goods.buy_min_number || 1,
               goods_favor_text: data.goods.is_favor == 1 ? '已收藏' : '收藏',
-              goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor + '.png',
+              goods_favor_icon: '/images/default-favor-icon-' + data.goods.is_favor + '.png',
               buy_button: data.buy_button || null,
 
               goods_spec_base_price: data.goods.price,
@@ -282,7 +282,7 @@ Page({
               this.setData({
                 'goods.is_favor': res.data.data.status,
                 goods_favor_text: res.data.data.text,
-                goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
+                goods_favor_icon: '/images/default-favor-icon-'+res.data.data.status+'.png'
               });
               app.showToast(res.data.msg, "success");
             } else {

sourcecode/baidu/default/pages/goods-detail/goods-detail.swan

@@ -163,7 +163,7 @@
   <!-- 底部操作 -->
   <view class="goods-buy-nav wh-auto bg-white">
     <view class="shop fl tc br-t" bindtap="shop_event">
-      <image src="/images/goods-detail-home-icon.png" mode="scaleToFill" />
+      <image src="/images/default-home-icon.png" mode="scaleToFill" />
       <text class="dis-block cr-888">首页</text>
     </view>
     <view class="collect fl tc br-t" bindtap="goods_favor_event">

sourcecode/baidu/default/pages/plugins/distribution/extraction-switch/extraction-switch.swan

@@ -26,7 +26,7 @@
         <view class="fr oh button-list">
           <button s-if="(item.is_default || 0) == 0" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_switch_event" data-index="{{index}}" hover-class="none">选择</button>
           <button s-else class="cr-ccc map-submit br" type="default" size="mini" hover-class="none" disabled="{{true}}">默认</button>
-          <button s-if="(item.lng || null) != null && (item.lat || null) != null" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+          <button s-if="(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
         </view>
       </view>
     </view>

sourcecode/baidu/default/pages/user-address/user-address.swan

@@ -19,7 +19,7 @@
           <text>设为默认地址</text>
         </view>
         <view class="fr oh submit-items">
-          <button s-if="(item.lng || null) != null && (item.lat || null) != null" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
+          <button s-if="(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_edit_event" data-index="{{index}}" hover-class="none">编辑</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
         </view>

sourcecode/baidu/default/pages/user-order-detail/user-order-detail.swan

@@ -10,7 +10,7 @@
           <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
           <view class="text fr">
             {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
-            <text s-if="detail.order_model == 2 && (detail.address_data.lng || 0) > 0 && (detail.address_data.lat || 0) > 0" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
+            <text s-if="detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null && detail.address_data.lng != 0 && detail.address_data.lat != 0) != null" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
           </view>
       </view>
   </view>

sourcecode/baidu/default/pages/user-order/user-order.css

 /*
- * 导航
+* 导航
+*/
+.nav {
+  background: #eee;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.nav .item {
+  width: 16.66%;
+}
+
+/*
+ * 列表
  */
- .nav {
-    background: #eee;
-    height: 80rpx;
-    line-height: 80rpx;
-  }
-  .nav .item {
-    width: 16.66%;
-  }
-  
-  /*
-   * 列表
-   */
-  .scroll-box{
-      height: calc(100vh - 80rpx);
-  }
-  .goods-base {
-    min-height: 160rpx;
-    margin-left: 180rpx;
+.scroll-box{
+    height: calc(100vh - 80rpx);
+}
+.goods-base {
+  min-height: 160rpx;
+  margin-left: 180rpx;
+  position: relative;
+}
+.goods-title {
+    line-height: 36rpx;
+}
+.list-item .goods-item:last-child {
+    border-bottom: 0;
+}
+.goods-item {
+    padding: 20rpx 10rpx;
+}
+.goods-title, .goods-spec {
+    margin-bottom: 10rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+    margin-right: 20rpx;
+}
+.goods-price {
     position: relative;
-  }
-  .goods-title {
-      line-height: 36rpx;
-  }
-  .list-item .goods-item:last-child {
-      border-bottom: 0;
-  }
-  .goods-item {
-      padding: 20rpx 10rpx;
-  }
-  .goods-title, .goods-spec {
-      margin-bottom: 10rpx;
-  }
-  .goods-image {
-      width: 160rpx;
-      height: 160rpx;
-      margin-right: 20rpx;
-  }
-  .goods-price {
-      position: relative;
-      margin-top: 10rpx;
-  }
-  .buy-number {
-      position: absolute;
-      right: 0;
-      bottom: 0;
-  }
-  .item-base, .item-describe, .item-operation {
-      padding: 20rpx 10rpx 20rpx 10rpx;
-  }
-  .submit-cancel {
-      border: 1px solid #f7c3b3;
-      color: #f7c3b3 !important;
-  }
-  .item-operation button:not(:first-child) {
-      margin-left: 20rpx;
-  }
-  .item-operation button {
-      padding: 0 35rpx;
-  }
-  .orderaftersale-btn-text {
+    margin-top: 10rpx;
+}
+.buy-number {
     position: absolute;
     right: 0;
     bottom: 0;
-    color: #4d7fa7;
-  }
-  
-  /**
-   * 支付方式
-   */
-  .payment-list {
-    padding: 40rpx 0;
-  }
-  .payment-list .item {
-    width: 50%;
-  }
-  .payment-list .item-content {
-    margin: 20rpx;
-    padding: 20rpx 10rpx;
-  }
-  .payment-list .item-content image {
-    width: 50rpx;
-    height: 50rpx !important;
-    vertical-align: middle;
-    margin-right: 10rpx;
-  }
-  
-  /**
-   * 选择
-   */
-   .selected .icon {
-    width: 35rpx;
-    height: 35rpx !important;
-    margin: 0 20rpx 0 10rpx;
-    vertical-align: middle;
-  }
-  
-  /**
-   * 合并支付按钮
-   */
-  .pay-merge-submit {
-    width: 220rpx;
-    height: 70rpx !important;
-    line-height: 74rpx !important;
-    left: calc(50% - 110rpx);
-    bottom: 50rpx;
-  }
\ No newline at end of file
+}
+.item-base, .item-describe, .item-operation {
+    padding: 20rpx 10rpx 20rpx 10rpx;
+}
+.warehouse-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
+.submit-cancel {
+    border: 1px solid #f7c3b3;
+    color: #f7c3b3 !important;
+}
+.item-operation button:not(:first-child) {
+    margin-left: 20rpx;
+}
+.item-operation button {
+    padding: 0 35rpx;
+}
+.orderaftersale-btn-text {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  color: #4d7fa7;
+}
+
+/**
+ * 支付方式
+ */
+.payment-list {
+  padding: 40rpx 0;
+}
+.payment-list .item {
+  width: 50%;
+}
+.payment-list .item-content {
+  margin: 20rpx;
+  padding: 20rpx 10rpx;
+}
+.payment-list .item-content image {
+  width: 50rpx;
+  height: 50rpx !important;
+  vertical-align: middle;
+  margin-right: 10rpx;
+}
+
+/**
+ * 选择
+ */
+ .selected .icon {
+  width: 35rpx;
+  height: 35rpx !important;
+  margin: 0 20rpx 0 10rpx;
+  vertical-align: middle;
+}
+
+/**
+ * 合并支付按钮
+ */
+.pay-merge-submit {
+  width: 220rpx;
+  height: 70rpx !important;
+  line-height: 74rpx !important;
+  left: calc(50% - 110rpx);
+  bottom: 50rpx;
+}
\ No newline at end of file

sourcecode/baidu/default/pages/user-order/user-order.js

@@ -484,5 +484,10 @@ Page({
       is_show_payment_popup: true,
       temp_pay_value: this.data.order_select_ids.join(',')
     });
-  }
+  },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });
\ No newline at end of file

sourcecode/baidu/default/pages/user-order/user-order.swan

@@ -17,7 +17,10 @@
             <image class="icon" src="/images/default-select{{tools.indexOf(order_select_ids, item.id) ? '-active' : ''}}-icon.png" mode="widthFix" />
           </view>
           <!-- 基础信息 -->
-          <text class="fl cr-666">{{item.warehouse_name}}</text>
+          <view class="fl" bindtap="warehouse_group_event" data-value="{{item.warehouse_url || ''}}">
+          <image s-if="(item.warehouse_icon || null) != null" class="warehouse-group-icon va-m margin-right-xs" src="{{item.warehouse_icon}}" mode="aspectFit" />
+          <text class="cr-666 va-m">{{item.warehouse_name}}</text>
+        </view>
           <text class="fr cr-main">{{item.status_name}}<text s-if="(item.is_under_line_text || null) != null">（{{item.is_under_line_text}}）</text></text>
       </view>
       <view s-for="detail, index in item.items" s-key="key" class="goods-item br-b-dashed oh">

sourcecode/qq/default/app.js

@@ -898,4 +898,59 @@ App({
     return uuid;
   },
 
+  // 链接地址事件
+  url_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var temp = value.substr(0, 6);
+      if(temp == 'http:/' || temp == 'https:')
+      {
+        this.open_web_view(value);
+      } else {
+        if (this.is_tabbar_pages(value))
+        {
+          qq.switchTab({ url: value });
+        } else {
+          qq.navigateTo({ url: value });
+        }
+      }
+    }
+  },
+
+  // 剪贴板
+  text_copy_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var self = this;
+      qq.setClipboardData({
+        data: value,
+        success (res) {
+          qq.getClipboardData({
+            success (res) {
+              self.showToast('复制成功', 'success');
+            }
+          });
+        }
+      });
+    } else {
+      this.showToast('复制内容为空');
+    }
+  },
+
+  // 图片预览
+  image_show_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      qq.previewImage({
+        current: value,
+        urls: [value]
+      });
+    } else {
+      this.showToast('图片地址为空');
+    }
+  },
+
 });
\ No newline at end of file

sourcecode/qq/default/pages/buy/buy.js

@@ -399,4 +399,9 @@ Page({
     this.setData({plugins_points_status: !this.data.plugins_points_status});
     this.init();
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });

sourcecode/qq/default/pages/buy/buy.qml

@@ -36,11 +36,12 @@
     <view class="goods-group-list bg-white spacing-mb" qq:for="{{goods_list}}" qq:for-item="group" qq:key="key">
       <!-- 仓库分组 -->
       <view class="goods-group-hd oh br-b">
-        <view class="fl">
-          <text class="goods-group-title">{{group.name}}</text>
-          <text qq:if="{{(group.alias || null) != null}}" class="goods-group-alias">{{group.alias}}</text>
+        <view class="fl" bindtap="warehouse_group_event" data-value="{{group.url || ''}}">
+          <image qq:if="{{(group.icon || null) != null}}" class="goods-group-icon va-m margin-right-xs" src="{{group.icon}}" mode="aspectFit" />
+          <text class="goods-group-title va-m">{{group.name}}</text>
+          <text qq:if="{{(group.alias || null) != null}}" class="goods-group-alias va-m">{{group.alias}}</text>
         </view>
-        <view qq:if="{{(group.lng || null) != null && (group.lat || null) != null}}" class="fr">
+        <view qq:if="{{(group.lng || null) != null && (group.lat || null) != null && group.lng != 0 && group.lat != 0}}" class="fr">
           <view class="goods-group-map-submit br" data-index="{{index}}" bindtap="map_event">查看地图</view>
         </view>
       </view>

sourcecode/qq/default/pages/buy/buy.qss

@@ -50,6 +50,10 @@
 .goods-group-hd {
   padding: 20rpx 0;
 }
+.goods-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .goods-group-title {
   font-weight: bold;
   vertical-align: middle;

sourcecode/qq/default/pages/extraction-address/extraction-address.qml

@@ -23,7 +23,7 @@
           <text class="cr-666">{{item.distance_value}}</text>
           <text class="cr-888">{{item.distance_unit}}</text>
         </view>
-        <button qq:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+        <button qq:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
       </view>
     </view>
   </view>

sourcecode/qq/default/pages/goods-detail/goods-detail.js

@@ -17,7 +17,7 @@ Page({
     goods_content_app: [],
     popup_status: false,
     goods_favor_text: '收藏',
-    goods_favor_icon: '/images/goods-detail-favor-icon-0.png',
+    goods_favor_icon: '/images/default-favor-icon-0.png',
     temp_buy_number: 1,
     buy_event_type: 'buy',
     buy_button: {},
@@ -137,7 +137,7 @@ Page({
               goods_content_app: data.goods.content_app || [],
               temp_buy_number: data.goods.buy_min_number || 1,
               goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
-              goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
+              goods_favor_icon: '/images/default-favor-icon-' + data.goods.is_favor+'.png',
               buy_button: data.buy_button || null,
 
               goods_spec_base_price: data.goods.price,
@@ -296,7 +296,7 @@ Page({
               this.setData({
                 'goods.is_favor': res.data.data.status,
                 goods_favor_text: res.data.data.text,
-                goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
+                goods_favor_icon: '/images/default-favor-icon-'+res.data.data.status+'.png'
               });
               app.showToast(res.data.msg, "success");
             } else {

sourcecode/qq/default/pages/goods-detail/goods-detail.qml

@@ -170,7 +170,7 @@
   <!-- 底部操作 -->
   <view class="goods-buy-nav wh-auto bg-white">
     <view class="shop fl tc br-t" bindtap="shop_event">
-      <image src="/images/goods-detail-home-icon.png" mode="scaleToFill" />
+      <image src="/images/default-home-icon.png" mode="scaleToFill" />
       <text class="dis-block cr-888">首页</text>
     </view>
     <view class="collect fl tc br-t" bindtap="goods_favor_event">

sourcecode/qq/default/pages/goods-detail/goods-detail.qss

@@ -196,9 +196,14 @@
 .goods-buy-nav-btn-number-10 button {
   width: 10% !important;
 }
-.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
-.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
-
+.goods-buy-nav .collect {
+  border-left: 1px solid #e1e1e1;
+}
+.goods-buy-nav .fl image {
+  width: 20px;
+  height: 20px;
+  margin: 5rpx 0;
+}
 .goods-buy-nav .dis-block {
   margin-top: -10rpx;
 }

sourcecode/qq/default/pages/user-address/user-address.qml

@@ -19,7 +19,7 @@
           <text>设为默认地址</text>
         </view>
         <view class="fr oh submit-items">
-          <button qq:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
+          <button qq:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_edit_event" data-index="{{index}}" hover-class="none">编辑</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
         </view>

sourcecode/qq/default/pages/user-order-detail/user-order-detail.qml

@@ -10,7 +10,7 @@
           <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
           <view class="text fr">
             {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
-            <!-- <text qq:if="{{detail.order_model == 2 && (detail.address_data.lng || 0) > 0 && (detail.address_data.lat || 0) > 0}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text> -->
+            <!-- <text qq:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null && detail.address_data.lng != 0 && detail.address_data.lat != 0) != null}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text> -->
           </view>
       </view>
   </view>

sourcecode/qq/default/pages/user-order/user-order.js

@@ -511,4 +511,9 @@ Page({
       temp_pay_value: this.data.order_select_ids.join(',')
     });
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });

sourcecode/qq/default/pages/user-order/user-order.qml

@@ -17,7 +17,10 @@
           <image class="icon" src="/images/default-select{{tools.indexOf(order_select_ids, item.id) ? '-active' : ''}}-icon.png" mode="widthFix" />
         </view>
         <!-- 基础信息 -->
-        <text class="fl cr-666">{{item.warehouse_name}}</text>
+        <view class="fl" bindtap="warehouse_group_event" data-value="{{item.warehouse_url || ''}}">
+          <image qq:if="{{(item.warehouse_icon || null) != null}}" class="warehouse-group-icon va-m margin-right-xs" src="{{item.warehouse_icon}}" mode="aspectFit" />
+          <text class="cr-666 va-m">{{item.warehouse_name}}</text>
+        </view>
         <text class="fr cr-main">{{item.status_name}}<text qq:if="{{(item.is_under_line_text || null) != null}}">（{{item.is_under_line_text}}）</text></text>
       </view>
       <view qq:for="{{item.items}}" qq:key="key" qq:for-item="detail" class="goods-item br-b-dashed oh">

sourcecode/qq/default/pages/user-order/user-order.qss

@@ -50,6 +50,10 @@
 .item-base, .item-describe, .item-operation {
     padding: 20rpx 10rpx 20rpx 10rpx;
 }
+.warehouse-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .submit-cancel {
     border: 1px solid #f7c3b3;
     color: #f7c3b3 !important;

sourcecode/toutiao/default/app.js

@@ -1016,4 +1016,59 @@ App({
     return uuid;
   },
 
+  // 链接地址事件
+  url_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var temp = value.substr(0, 6);
+      if(temp == 'http:/' || temp == 'https:')
+      {
+        this.open_web_view(value);
+      } else {
+        if (this.is_tabbar_pages(value))
+        {
+          tt.switchTab({ url: value });
+        } else {
+          tt.navigateTo({ url: value });
+        }
+      }
+    }
+  },
+
+  // 剪贴板
+  text_copy_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      var self = this;
+      tt.setClipboardData({
+        data: value,
+        success (res) {
+          tt.getClipboardData({
+            success (res) {
+              self.showToast('复制成功', 'success');
+            }
+          });
+        }
+      });
+    } else {
+      this.showToast('复制内容为空');
+    }
+  },
+
+  // 图片预览
+  image_show_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value != null)
+    {
+      tt.previewImage({
+        current: value,
+        urls: [value]
+      });
+    } else {
+      this.showToast('图片地址为空');
+    }
+  },
+
 });
\ No newline at end of file

sourcecode/toutiao/default/pages/buy/buy.js

@@ -429,4 +429,9 @@ Page({
     this.setData({plugins_points_status: !this.data.plugins_points_status});
     this.init();
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });
\ No newline at end of file

sourcecode/toutiao/default/pages/buy/buy.ttml

@@ -36,11 +36,12 @@
     <view class="goods-group-list bg-white spacing-mb" tt:for="{{goods_list}}" tt:for-item="group" tt:key="key">
       <!-- 仓库分组 -->
       <view class="goods-group-hd oh br-b">
-        <view class="fl">
-          <text class="goods-group-title">{{group.name}}</text>
-          <text tt:if="{{(group.alias || null) != null}}" class="goods-group-alias">{{group.alias}}</text>
+        <view class="fl" bindtap="warehouse_group_event" data-value="{{group.url || ''}}">
+          <image tt:if="{{(group.icon || null) != null}}" class="goods-group-icon va-m margin-right-xs" src="{{group.icon}}" mode="aspectFit" />
+          <text class="goods-group-title va-m">{{group.name}}</text>
+          <text tt:if="{{(group.alias || null) != null}}" class="goods-group-alias va-m">{{group.alias}}</text>
         </view>
-        <view tt:if="{{(group.lng || null) != null && (group.lat || null) != null}}" class="fr">
+        <view tt:if="{{(group.lng || null) != null && (group.lat || null) != null && group.lng != 0 && group.lat != 0}}" class="fr">
           <view class="goods-group-map-submit br" data-index="{{index}}" bindtap="map_event">查看地图</view>
         </view>
       </view>

sourcecode/toutiao/default/pages/buy/buy.ttss

@@ -50,6 +50,10 @@
 .goods-group-hd {
   padding: 20rpx 0;
 }
+.goods-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .goods-group-title {
   font-weight: bold;
   vertical-align: middle;

sourcecode/toutiao/default/pages/extraction-address/extraction-address.ttml

@@ -23,7 +23,7 @@
           <text class="cr-666">{{item.distance_value}}</text>
           <text class="cr-888">{{item.distance_unit}}</text>
         </view>
-        <button tt:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+        <button tt:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
       </view>
     </view>
   </view>

sourcecode/toutiao/default/pages/goods-detail/goods-detail.js

@@ -17,7 +17,7 @@ Page({
     goods_content_app: [],
     popup_status: false,
     goods_favor_text: '收藏',
-    goods_favor_icon: '/images/goods-detail-favor-icon-0.png',
+    goods_favor_icon: '/images/default-favor-icon-0.png',
     temp_buy_number: 1,
     buy_event_type: 'buy',
     buy_button: {},
@@ -137,7 +137,7 @@ Page({
               goods_content_app: data.goods.content_app || [],
               temp_buy_number: data.goods.buy_min_number || 1,
               goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
-              goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
+              goods_favor_icon: '/images/default-favor-icon-' + data.goods.is_favor+'.png',
               buy_button: data.buy_button || null,
 
               goods_spec_base_price: data.goods.price,
@@ -296,7 +296,7 @@ Page({
               this.setData({
                 'goods.is_favor': res.data.data.status,
                 goods_favor_text: res.data.data.text,
-                goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
+                goods_favor_icon: '/images/default-favor-icon-'+res.data.data.status+'.png'
               });
               app.showToast(res.data.msg, "success");
             } else {

sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml

@@ -170,7 +170,7 @@
   <!-- 底部操作 -->
   <view class="goods-buy-nav wh-auto bg-white">
     <view class="shop fl tc br-t" bindtap="shop_event">
-      <image src="/images/goods-detail-home-icon.png" mode="scaleToFill" />
+      <image src="/images/default-home-icon.png" mode="scaleToFill" />
       <text class="dis-block cr-888">首页</text>
     </view>
     <view class="collect fl tc br-t" bindtap="goods_favor_event">

sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss

@@ -196,9 +196,14 @@
 .goods-buy-nav-btn-number-10 button {
   width: 10% !important;
 }
-.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
-.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
-
+.goods-buy-nav .collect {
+  border-left: 1px solid #e1e1e1;
+}
+.goods-buy-nav .fl image {
+  width: 20px;
+  height: 20px;
+  margin: 5rpx 0;
+}
 .goods-buy-nav .dis-block {
   margin-top: -10rpx;
 }

sourcecode/toutiao/default/pages/plugins/distribution/extraction-switch/extraction-switch.ttml

@@ -26,7 +26,7 @@
         <view class="fr oh button-list">
           <button tt:if="{{(item.is_default || 0) == 0}}" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_switch_event" data-index="{{index}}" hover-class="none">选择</button>
           <button tt:else class="cr-ccc map-submit br" type="default" size="mini" hover-class="none" disabled="{{true}}">默认</button>
-          <button tt:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+          <button tt:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
         </view>
       </view>
     </view>

sourcecode/toutiao/default/pages/user-address/user-address.ttml

@@ -19,7 +19,7 @@
           <text>设为默认地址</text>
         </view>
         <view class="fr oh submit-items">
-          <button tt:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
+          <button tt:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_edit_event" data-index="{{index}}" hover-class="none">编辑</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
         </view>

sourcecode/toutiao/default/pages/user-order-detail/user-order-detail.ttml

@@ -10,7 +10,7 @@
           <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
           <view class="text fr">
             {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
-            <text tt:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null) != null}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
+            <text tt:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null) != null && detail.address_data.lng != 0 && detail.address_data.lat != 0}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
           </view>
       </view>
   </view>

sourcecode/toutiao/default/pages/user-order/user-order.js

@@ -534,6 +534,10 @@ Page({
       is_show_payment_popup: true,
       temp_pay_value: this.data.order_select_ids.join(',')
     });
-  }
+  },
 
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });
\ No newline at end of file

sourcecode/toutiao/default/pages/user-order/user-order.ttml

@@ -17,7 +17,10 @@
           <image class="icon" src="/images/default-select{{tools.indexOf(order_select_ids, item.id) ? '-active' : ''}}-icon.png" mode="widthFix" />
         </view>
         <!-- 基础信息 -->
-        <text class="fl cr-666">{{item.warehouse_name}}</text>
+        <view class="fl" bindtap="warehouse_group_event" data-value="{{item.warehouse_url || ''}}">
+          <image tt:if="{{(item.warehouse_icon || null) != null}}" class="warehouse-group-icon va-m margin-right-xs" src="{{item.warehouse_icon}}" mode="aspectFit" />
+          <text class="cr-666 va-m">{{item.warehouse_name}}</text>
+        </view>
         <text class="fr cr-main">{{item.status_name}}<text tt:if="{{(item.is_under_line_text || null) != null}}">（{{item.is_under_line_text}}）</text></text>
       </view>
       <view tt:for="{{item.items}}" tt:key="key" tt:for-item="detail" class="goods-item br-b-dashed oh">

sourcecode/toutiao/default/pages/user-order/user-order.ttss

@@ -50,6 +50,10 @@
 .item-base, .item-describe, .item-operation {
     padding: 20rpx 10rpx 20rpx 10rpx;
 }
+.warehouse-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .submit-cancel {
     border: 1px solid #f7c3b3;
     color: #f7c3b3 !important;

sourcecode/weixin/default/pages/buy/buy.js

@@ -400,4 +400,9 @@ Page({
     this.setData({plugins_points_status: !this.data.plugins_points_status});
     this.init();
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });

sourcecode/weixin/default/pages/buy/buy.wxml

@@ -36,11 +36,12 @@
     <view class="goods-group-list bg-white spacing-mb" wx:for="{{goods_list}}" wx:for-item="group" wx:key="key">
       <!-- 仓库分组 -->
       <view class="goods-group-hd oh br-b">
-        <view class="fl">
-          <text class="goods-group-title">{{group.name}}</text>
-          <text wx:if="{{(group.alias || null) != null}}" class="goods-group-alias">{{group.alias}}</text>
+        <view class="fl" bindtap="warehouse_group_event" data-value="{{group.url || ''}}">
+          <image wx:if="{{(group.icon || null) != null}}" class="goods-group-icon va-m margin-right-xs" src="{{group.icon}}" mode="aspectFit" />
+          <text class="goods-group-title va-m">{{group.name}}</text>
+          <text wx:if="{{(group.alias || null) != null}}" class="goods-group-alias va-m">{{group.alias}}</text>
         </view>
-        <view wx:if="{{(group.lng || null) != null && (group.lat || null) != null}}" class="fr">
+        <view wx:if="{{(group.lng || null) != null && (group.lat || null) != null && group.lng != 0 && group.lat != 0}}" class="fr">
           <view class="goods-group-map-submit br" data-index="{{index}}" bindtap="map_event">查看地图</view>
         </view>
       </view>

sourcecode/weixin/default/pages/buy/buy.wxss

@@ -50,6 +50,10 @@
 .goods-group-hd {
   padding: 20rpx 0;
 }
+.goods-group-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
 .goods-group-title {
   font-weight: bold;
   vertical-align: middle;

sourcecode/weixin/default/pages/extraction-address/extraction-address.wxml

@@ -23,7 +23,7 @@
           <text class="cr-666">{{item.distance_value}}</text>
           <text class="cr-888">{{item.distance_unit}}</text>
         </view>
-        <button wx:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+        <button wx:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="fr cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
       </view>
     </view>
   </view>

sourcecode/weixin/default/pages/goods-detail/goods-detail.js

@@ -17,7 +17,7 @@ Page({
     goods_content_app: [],
     popup_status: false,
     goods_favor_text: '收藏',
-    goods_favor_icon: '/images/goods-detail-favor-icon-0.png',
+    goods_favor_icon: '/images/default-favor-icon-0.png',
     temp_buy_number: 1,
     buy_event_type: 'buy',
     buy_button: {},
@@ -34,7 +34,7 @@ Page({
     // 导航首页按钮
     nav_home_button_info: {
       "name": "首页",
-      "icon": "/images/goods-detail-home-icon.png",
+      "icon": "/images/default-home-icon.png",
       "value": "/pages/index/index"
     },
 
@@ -165,7 +165,7 @@ Page({
               goods_content_app: data.goods.content_app || [],
               temp_buy_number: data.goods.buy_min_number || 1,
               goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
-              goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
+              goods_favor_icon: '/images/default-favor-icon-' + data.goods.is_favor+'.png',
               buy_button: data.buy_button || null,
 
               goods_spec_base_price: data.goods.price,
@@ -343,7 +343,7 @@ Page({
               this.setData({
                 'goods.is_favor': res.data.data.status,
                 goods_favor_text: res.data.data.text,
-                goods_favor_icon: '/images/goods-detail-favor-icon-'+res.data.data.status+'.png'
+                goods_favor_icon: '/images/default-favor-icon-'+res.data.data.status+'.png'
               });
               app.showToast(res.data.msg, "success");
             } else {

sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss

@@ -196,9 +196,14 @@
 .goods-buy-nav-btn-number-10 button {
   width: 10% !important;
 }
-.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
-.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
-
+.goods-buy-nav .collect {
+  border-left: 1px solid #e1e1e1;
+}
+.goods-buy-nav .fl image {
+  width: 20px;
+  height: 20px;
+  margin: 5rpx 0;
+}
 .goods-buy-nav .dis-block {
   margin-top: -10rpx;
 }

sourcecode/weixin/default/pages/plugins/distribution/extraction-apply/extraction-apply.js

@@ -96,7 +96,7 @@ Page({
             // 地理位置
             var lng = extraction_data.lng || null;
             var lat = extraction_data.lat || null;
-            if (lng != null && lat != null)
+            if (lng != null && lat != null && lng != 0 && lat != 0)
             {
               self.setData({ user_location: {
                 lng: lng,

sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.wxml

@@ -26,7 +26,7 @@
         <view class="fr oh button-list">
           <button wx:if="{{(item.is_default || 0) == 0}}" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_switch_event" data-index="{{index}}" hover-class="none">选择</button>
           <button wx:else class="cr-ccc map-submit br" type="default" size="mini" hover-class="none" disabled="{{true}}">默认</button>
-          <button wx:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
+          <button wx:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 map-submit br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">查看地图</button>
         </view>
       </view>
     </view>

sourcecode/weixin/default/pages/plugins/shop/public/header.wxml

@@ -21,7 +21,7 @@
           <text class="va-m cr-666">在线客服</text>
         </view>
         <view class="fl single-text" bindtap="shop_favor_event">
-          <image src="/images/default-xingxing-icon{{shop_favor_info.status == 1 ? '-active' : ''}}.png" mode="scaleToFill" class="va-m" />
+          <image src="/images/default-favor-icon-{{shop_favor_info.status}}.png" mode="scaleToFill" class="va-m" />
           <text class="va-m {{shop_favor_info.status == 1 ? 'cr-main' : ''}}">{{shop_favor_info.text}}({{shop_favor_info.count}})</text>
         </view>
       </view>

sourcecode/weixin/default/pages/user-address-save/user-address-save.js

@@ -130,7 +130,7 @@ Page({
             // 地理位置
             var lng = ads_data.lng || null;
             var lat = ads_data.lat || null;
-            if (lng != null && lat != null)
+            if (lng != null && lat != null && lng != 0 && lat != 0)
             {
               self.setData({ user_location: {
                 lng: lng,

sourcecode/weixin/default/pages/user-address/user-address.wxml

@@ -19,7 +19,7 @@
           <text>设为默认地址</text>
         </view>
         <view class="fr oh submit-items">
-          <button wx:if="{{(item.lng || null) != null && (item.lat || null) != null}}" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
+          <button wx:if="{{(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0}}" class="cr-666 br" type="default" size="mini" bindtap="address_map_event" data-index="{{index}}" hover-class="none">位置</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_edit_event" data-index="{{index}}" hover-class="none">编辑</button>
           <button class="cr-666 br" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
         </view>

sourcecode/weixin/default/pages/user-order-detail/user-order-detail.wxml

@@ -10,7 +10,7 @@
           <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
           <view class="text fr">
             {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
-            <text wx:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null) != null}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
+            <text wx:if="{{detail.order_model == 2 && (detail.address_data.lng || null) != null && (detail.address_data.lat || null && detail.address_data.lng != 0 && detail.address_data.lat != 0) != null}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
           </view>
       </view>
   </view>

sourcecode/weixin/default/pages/user-order/user-order.js

@@ -500,4 +500,9 @@ Page({
       temp_pay_value: this.data.order_select_ids.join(',')
     });
   },
+
+  // 仓库事件
+  warehouse_group_event(e) {
+    app.url_event(e);
+  },
 });

sourcecode/weixin/default/pages/user-order/user-order.wxml

@@ -17,7 +17,10 @@
           <image class="icon" src="/images/default-select{{tools.indexOf(order_select_ids, item.id) ? '-active' : ''}}-icon.png" mode="widthFix" />
         </view>
         <!-- 基础信息 -->
-        <text class="fl cr-666">{{item.warehouse_name}}</text>
+        <view class="fl" bindtap="warehouse_group_event" data-value="{{item.warehouse_url || ''}}">
+          <image wx:if="{{(item.warehouse_icon || null) != null}}" class="warehouse-group-icon va-m margin-right-xs" src="{{item.warehouse_icon}}" mode="aspectFit" />
+          <text class="cr-666 va-m">{{item.warehouse_name}}</text>
+        </view>
         <text class="fr cr-main">{{item.status_name}}<text wx:if="{{(item.is_under_line_text || null) != null}}">（{{item.is_under_line_text}}）</text></text>
       </view>
       <view wx:for="{{item.items}}" wx:key="key" wx:for-item="detail" class="goods-item br-b-dashed oh">