diff --git a/application/admin/view/default/appconfig/alipaymini.html b/application/admin/view/default/appconfig/alipaymini.html
new file mode 100644
index 0000000000000000000000000000000000000000..6b7b2fee7609fd5ab57fd0c25363325ce616eded
--- /dev/null
+++ b/application/admin/view/default/appconfig/alipaymini.html
@@ -0,0 +1,38 @@
+{{include file="public/header" /}}
+
+<!-- right content start  -->
+<div class="content-right">
+    <div class="content">
+        <!-- table nav start -->
+        {{include file="appconfig/nav" /}}
+        <!-- table nav end -->
+
+        <!-- tips -->
+        <div class="am-alert am-alert-warning" data-am-alert>
+            <p>PS：如【APP/小程序】中开启（开启在线客服），则以下配置必填 [企业编码] 和 [聊天窗编码]</p>
+        </div>
+
+        <!-- form start -->
+        <form class="am-form form-validation view-save" action="{{:MyUrl('admin/appconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'alipaymini'])}}" enctype="multipart/form-data">
+            <div class="am-form-group">
+                <label>{{$data.common_app_mini_alipay_tnt_inst_id.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_alipay_tnt_inst_id.describe}}</span></label>
+                <input type="text" name="{{$data.common_app_mini_alipay_tnt_inst_id.only_tag}}" placeholder="{{$data.common_app_mini_alipay_tnt_inst_id.name}}" data-validation-message="{{$data.common_app_mini_alipay_tnt_inst_id.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_alipay_tnt_inst_id.value}}"{{/if}} />
+            </div>
+            <div class="am-form-group">
+                <label>{{$data.common_app_mini_alipay_scene.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_alipay_scene.describe}}</span></label>
+                <input type="text" name="{{$data.common_app_mini_alipay_scene.only_tag}}" placeholder="{{$data.common_app_mini_alipay_scene.name}}" data-validation-message="{{$data.common_app_mini_alipay_scene.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_alipay_scene.value}}"{{/if}} />
+            </div>
+
+            <div class="am-form-group am-form-group-refreshing">
+                <input type="hidden" name="nav_type" value="{{$nav_type}}" />
+                <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+            </div>
+        </form>
+        <!-- form end -->
+    </div>
+</div>
+<!-- right content end  -->
+        
+<!-- footer start -->
+{{include file="public/footer" /}}
+<!-- footer end -->
\ No newline at end of file
diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html
index 7499c2700d59bb60fae61f3c6bececbc6ac72e5c..9d248e8983d58e58476f46a97b88bc1aaf2bad3c 100644
--- a/application/admin/view/default/appconfig/app.html
+++ b/application/admin/view/default/appconfig/app.html
@@ -108,4 +108,4 @@
         
 <!-- footer start -->
 {{include file="public/footer" /}}
-<!-- footer end
\ No newline at end of file
+<!-- footer end  -->
\ No newline at end of file
diff --git a/application/admin/view/default/appconfig/nav.html b/application/admin/view/default/appconfig/nav.html
index 934e844f654b6c688cf6f0f436e973933dfc9d6b..22f3a823c22605f95db668eefaf89640cca3f2e8 100644
--- a/application/admin/view/default/appconfig/nav.html
+++ b/application/admin/view/default/appconfig/nav.html
@@ -8,4 +8,7 @@
     <li {{if $nav_type eq 'weixinmini'}}class="am-active"{{/if}} data-type="weixinmini">
         <a href="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'weixinmini'])}}">微信小程序</a>
     </li>
+    <li {{if $nav_type eq 'alipaymini'}}class="am-active"{{/if}} data-type="alipaymini">
+        <a href="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'alipaymini'])}}">支付宝小程序</a>
+    </li>
 </ul>
\ No newline at end of file
diff --git a/application/admin/view/default/appconfig/weixinmini.html b/application/admin/view/default/appconfig/weixinmini.html
index f9d25fe325ea13d831eec99f1762ec572f5222fd..832c61252e454bd622f72f33980e768dab447670 100644
--- a/application/admin/view/default/appconfig/weixinmini.html
+++ b/application/admin/view/default/appconfig/weixinmini.html
@@ -39,4 +39,4 @@
         
 <!-- footer start -->
 {{include file="public/footer" /}}
-<!-- footer end
\ No newline at end of file
+<!-- footer end  -->
\ No newline at end of file
diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index b82332d2afbcdb8f61175ecfe92f4ac53da8420f..abe4ca25d3b49d509b8599da5a4cd8213cf2ff1d 100755
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -138,6 +138,13 @@ class Goods extends Common
             'plugins_coupon_data'               => $this->PluginsCouponGoods($goods_id),
         ];
 
+        // 支付宝小程序在线客服
+        if(APPLICATION_CLIENT_TYPE == 'alipay')
+        {
+            $result['common_app_mini_alipay_tnt_inst_id'] = MyC('common_app_mini_alipay_tnt_inst_id', null, true);
+            $result['common_app_mini_alipay_scene'] = MyC('common_app_mini_alipay_scene', null, true);
+        }
+
         // 秒杀
         if($result['common_app_is_limitedtimediscount'] == 1)
         {
diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php
index 60b3308d8a5417b4fbd288bfb3113207bc8c3f96..7c047776c97cbd5c46849bbdd396694b82be14e0 100755
--- a/application/api/controller/Index.php
+++ b/application/api/controller/Index.php
@@ -57,10 +57,17 @@ class Index extends Common
 			'common_app_is_enable_search'		=> (int) MyC('common_app_is_enable_search', 1),
 			'common_app_is_enable_answer'		=> (int) MyC('common_app_is_enable_answer', 1),
 			'common_app_is_header_nav_fixed'	=> (int) MyC('common_app_is_header_nav_fixed', 0),
-			'common_app_is_online_service'		=> (int) MyC('common_app_is_online_service', 0),
+			'common_app_is_online_service'			=> (int) MyC('common_app_is_online_service', 0),
 			'common_app_is_limitedtimediscount'	=> $common_app_is_limitedtimediscount,
 		];
 
+		// 支付宝小程序在线客服
+		if(APPLICATION_CLIENT_TYPE == 'alipay')
+		{
+			$result['common_app_mini_alipay_tnt_inst_id'] = MyC('common_app_mini_alipay_tnt_inst_id', null, true);
+			$result['common_app_mini_alipay_scene'] = MyC('common_app_mini_alipay_scene', null, true);
+		}
+
 		// 秒杀
 		if($common_app_is_limitedtimediscount == 1)
 		{
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index a97da186556285c22ec8a07afa5ce9d8851e3092..40e0d8412676c822cbfe0fe6b62f82505ae2e3d0 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -449,6 +449,13 @@ class User extends Common
             'common_app_is_head_vice_nav'       => (int) MyC('common_app_is_head_vice_nav', 0),
         );
 
+        // 支付宝小程序在线客服
+        if(APPLICATION_CLIENT_TYPE == 'alipay')
+        {
+            $result['common_app_mini_alipay_tnt_inst_id'] = MyC('common_app_mini_alipay_tnt_inst_id', null, true);
+            $result['common_app_mini_alipay_scene'] = MyC('common_app_mini_alipay_scene', null, true);
+        }
+
         // 返回数据
         return DataReturn('success', 0, $result);
     }
diff --git a/application/service/BuyService.php b/application/service/BuyService.php
index 4c983c3ec0e7978bfd842fe48bc160458e2ade4b..da4d7a0a3723ac1b90ea64cfd41601a6217e4de7 100755
--- a/application/service/BuyService.php
+++ b/application/service/BuyService.php
@@ -1193,9 +1193,10 @@ class BuyService
     {
         // 订单收货地址
         $data = [
-            'order_id'              => $order_id,
-            'user_id'               => $user_id,
+            'order_id'      => $order_id,
+            'user_id'       => $user_id,
             'address_id'    => isset($address['id']) ? intval($address['id']) : 0,
+            'alias'         => isset($address['alias']) ? $address['alias'] : '',
             'name'          => isset($address['name']) ? $address['name'] : '',
             'tel'           => isset($address['tel']) ? $address['tel'] : '',
             'province'      => isset($address['province']) ? intval($address['province']) : 0,
diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss
index 4b730869a3c2db706074fe8478104ea38d940ecd..0a8b275462f3682b75493f3cc2f4ac9cb84a2e3d 100644
--- a/public/appmini/old/alipay/app.acss
+++ b/public/appmini/old/alipay/app.acss
@@ -413,4 +413,11 @@ textarea {
 .common-quick-nav image {
   width: 60rpx;
   height: 60rpx;
+}
+
+/**
+ * 在线客服
+ */
+.common-online-service {
+  bottom: 35%;
 }
\ No newline at end of file
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index d0012e09bdbed174ea0b1653a13544fdd6a05fb6..c12fbd76e1557f5857ffc0fb0e5a498a6722e6fd 100644
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -67,8 +67,8 @@ App({
 
     // 请求地址
     request_url: "{{request_url}}",
-    // request_url: 'http://tp5-dev.com/',
-    // request_url: 'http://test.shopxo.net/',
+     request_url: 'http://tp5-dev.com/',
+     request_url: 'http://dev.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
@@ -669,4 +669,10 @@ App({
     return true;
   },
 
+  // 获取用户openid
+  get_user_openid() {
+    var user = this.get_user_cache_info();
+    return (user == false) ? null : user.alipay_openid || null;
+  },
+
 });
diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json
index 5602b18dd6b106d925426ee2d1b7aa72ea6623b5..588ad91ec33a53395a80c7d7bad381c7a798e059 100644
--- a/public/appmini/old/alipay/app.json
+++ b/public/appmini/old/alipay/app.json
@@ -27,10 +27,11 @@
     "pages/user-orderaftersale/user-orderaftersale",
     "pages/user-orderaftersale-detail/user-orderaftersale-detail",
     "pages/coupon/coupon",
-    "pages/user-coupon/user-coupon"
+    "pages/user-coupon/user-coupon",
+    "pages/extraction-address/extraction-address"
   ],
   "window": {
-    "defaultTitle": "{{application_title}}",
+    "defaultTitle": "test",
     "titleBarColor": "#d2364c"
   },
   "tabBar": {
diff --git a/public/appmini/old/alipay/images/goods-detail-video-close.png b/public/appmini/old/alipay/images/goods-detail-video-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..3356ecb57d66da3a2c3faecd265b5dd14e795ee4
Binary files /dev/null and b/public/appmini/old/alipay/images/goods-detail-video-close.png differ
diff --git a/public/appmini/old/alipay/images/goods-detail-video-play.png b/public/appmini/old/alipay/images/goods-detail-video-play.png
new file mode 100644
index 0000000000000000000000000000000000000000..789c398498f5c8012ee18ee5ecb173cbcf23a0aa
Binary files /dev/null and b/public/appmini/old/alipay/images/goods-detail-video-play.png differ
diff --git a/public/appmini/old/alipay/pages/answer-form/answer-form.js b/public/appmini/old/alipay/pages/answer-form/answer-form.js
index cde7a227619a4e86a74acb00c1eba88629c34573..dd17acfdfc81d127e107ddc1caca1040cf56d9a5 100755
--- a/public/appmini/old/alipay/pages/answer-form/answer-form.js
+++ b/public/appmini/old/alipay/pages/answer-form/answer-form.js
@@ -80,7 +80,9 @@ Page({
             }, 2000);
           } else {
             this.setData({form_submit_loading: false});
-            app.showToast(res.data.msg);
+            if (app.is_login_check(res.data)) {
+              app.showToast(res.data.msg);
+            }
           }
         },
         fail: () => {
diff --git a/public/appmini/old/alipay/pages/answer-list/answer-list.js b/public/appmini/old/alipay/pages/answer-list/answer-list.js
old mode 100755
new mode 100644
index 729c1cd46eaa86cd0ece4734aa97925ebb55a8e0..da3e4da29ac176e2de6462cb4e611f068f8d63d2
--- a/public/appmini/old/alipay/pages/answer-list/answer-list.js
+++ b/public/appmini/old/alipay/pages/answer-list/answer-list.js
@@ -76,7 +76,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/buy/buy.acss b/public/appmini/old/alipay/pages/buy/buy.acss
index cad5bfc2c44fc333f899328c0e16849b19d89de5..dd3ff279d70c797358d2ff48e3cdbb83ea9130f8 100644
--- a/public/appmini/old/alipay/pages/buy/buy.acss
+++ b/public/appmini/old/alipay/pages/buy/buy.acss
@@ -12,7 +12,7 @@
     padding: 10rpx 35rpx 10rpx 10rpx;
 }
 .address-detail .icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-detail .text {
@@ -30,6 +30,13 @@
     height: 85rpx;
     line-height: 85rpx;
 }
+.address-alias {
+  border: 1px solid #d2364c;
+  color: #d2364c;
+  padding: 2rpx 10rpx;
+  border-radius: 6rpx;
+  margin-right: 10rpx;
+}
 
 /**
  * 商品
diff --git a/public/appmini/old/alipay/pages/buy/buy.axml b/public/appmini/old/alipay/pages/buy/buy.axml
index e6a5762d4c131fc0b9281b3fcc5f7be92703eee0..5b5b5c56192cf6ec7b20f6317dd9e2915aac3056 100644
--- a/public/appmini/old/alipay/pages/buy/buy.axml
+++ b/public/appmini/old/alipay/pages/buy/buy.axml
@@ -1,126 +1,133 @@
-<view a:if="{{goods_list.length > 0}}" class="page">
-  <!-- 地址 -->
-  <view class="address bg-white arrow-right">
-    <navigator url="/pages/user-address/user-address?is_back=1" hover-class="none">
-      <view a:if="{{address != null}}">
-        <view class="address-base oh">
-          <text>{{address.name}}</text>
-          <text class="fr">{{address.tel}}</text>
+<block a:if="{{common_site_type == 1}}">
+  <import src="/pages/common/nodata.axml" />
+  <template is="nodata" data="{{status: 2, msg: '展示型不允许提交订单'}}"></template>
+</block>
+<block a:else>
+  <view a:if="{{goods_list.length > 0}}" class="page">
+    <!-- 地址 -->
+    <block a:if="{{common_site_type == 0 || common_site_type == 2}}">
+      <view class="address bg-white arrow-right" onTap="address_event">
+        <view a:if="{{address != null}}">
+          <view class="address-base oh">
+            <text a:if="{{(address.alias || null) != null}}" class="address-alias">{{address.alias}}</text>
+            <text>{{address.name}}</text>
+            <text class="fr">{{address.tel}}</text>
+          </view>
+          <view class="address-detail oh">
+            <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
+            <view class="text fr">{{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}</view>
+          </view>
         </view>
-        <view class="address-detail oh">
-          <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
-          <view class="text fr">{{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}}</view>
+        <view a:if="{{address == null}}" class="no-address cr-888">
+          请选择地址
         </view>
       </view>
-      <view a:if="{{address == null}}" class="no-address cr-888">
-        请选择地址
-      </view>
-    </navigator>
-  </view>
-  <view class="address-divider spacing-mb"></view>
+      <view class="address-divider spacing-mb"></view>
+    </block>
 
-  <!-- 商品 -->
-  <view class="goods bg-white spacing-mb">
-    <view a:for="{{goods_list}}" class="goods-item oh">
-      <image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
-      <view class="goods-base">
-        <view class="goods-title multi-text">{{item.title}}</view>
-        <block a:if="{{item.spec != null}}">
-          <view class="goods-spec cr-888" a:for="{{item.spec}}" a:for-item="spec">
-            {{spec.type}}:{{spec.value}}
-          </view>
-        </block>
-      </view>
-      <view class="oh goods-price">
-        <text class="sales-price">￥{{item.price}}
-        </text>
-        <text a:if="{{item.original_price > 0}}" class="original-price">￥{{item.original_price}}
-        </text>
-        <text class="buy-number cr-888">x{{item.stock}}
-        </text>
+    <!-- 商品 -->
+    <view class="goods bg-white spacing-mb">
+      <view a:for="{{goods_list}}" class="goods-item oh">
+        <image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
+        <view class="goods-base">
+          <view class="goods-title multi-text">{{item.title}}</view>
+          <block a:if="{{item.spec != null}}">
+            <view class="goods-spec cr-888" a:for="{{item.spec}}" a:for-item="spec">
+              {{spec.type}}:{{spec.value}}
+            </view>
+          </block>
+        </view>
+        <view class="oh goods-price">
+          <text class="sales-price">￥{{item.price}}
+          </text>
+          <text a:if="{{item.original_price > 0}}" class="original-price">￥{{item.original_price}}
+          </text>
+          <text class="buy-number cr-888">x{{item.stock}}
+          </text>
+        </view>
       </view>
     </view>
-  </view>
 
-  <!-- 留言 -->
-  <view class="content-textarea-view bg-white spacing-mb">
-    <textarea a:if="{{!popup_plugins_coupon_status}}" onInput="bind_user_note_event" value="{{user_note_value}}" maxlength="60" placeholder="留言" />
-    <view a:if="{{popup_plugins_coupon_status}}" class="cr-888">{{user_note_value || '留言'}}</view>
-  </view>
-
-  <!-- 优惠劵 -->
-  <view a:if="{{(plugins_coupon_data || null) != null && plugins_coupon_data.coupon_list.length > 0}}" class="plugins-coupon bg-white spacing-mb arrow-right" onTap="plugins_coupon_open_event">
-    <text class="cr-666">优惠劵</text>
-    <text class="cr-ccc fr">{{plugins_choice_coupon_value}}</text>
-  </view>
+    <!-- 留言 -->
+    <view class="content-textarea-view bg-white spacing-mb">
+      <textarea a:if="{{!popup_plugins_coupon_status}}" onInput="bind_user_note_event" value="{{user_note_value}}" maxlength="60" placeholder="留言" />
+      <view a:if="{{popup_plugins_coupon_status}}" class="cr-888">{{user_note_value || '留言'}}</view>
+    </view>
 
-  <!-- 扩展数据展示 -->
-  <view a:if="{{extension_data.length > 0}}" class="extension-list spacing-mb">
-    <view a:for="{{extension_data}}" class="item oh">
-      <text class="cr-666">{{item.name}}
-      </text>
-      <text class="text-tips fr">{{item.tips}}
-      </text>
+    <!-- 优惠劵 -->
+    <view a:if="{{(plugins_coupon_data || null) != null && plugins_coupon_data.coupon_list.length > 0}}" class="plugins-coupon bg-white spacing-mb arrow-right" onTap="plugins_coupon_open_event">
+      <text class="cr-666">优惠劵</text>
+      <text class="cr-ccc fr">{{plugins_choice_coupon_value}}</text>
     </view>
-  </view>
 
-  <!-- 支付方式 -->
-  <view a:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
-    <view class="item tc fl" a:for="{{payment_list}}">
-      <view class="item-content br {{(item.selected || '')}}" data-value="{{item.id}}" onTap="payment_event">
-        <image a:if="{{(item.logo || null) != null}}" class="icon" src="{{item.logo}}" mode="widthFix" />
-        <text>{{item.name}}</text>
+    <!-- 扩展数据展示 -->
+    <view a:if="{{extension_data.length > 0}}" class="extension-list spacing-mb">
+      <view a:for="{{extension_data}}" class="item oh">
+        <text class="cr-666">{{item.name}}
+        </text>
+        <text class="text-tips fr">{{item.tips}}
+        </text>
       </view>
     </view>
-  </view>
 
-  <!-- 导航 -->
-  <view class="buy-nav oh wh-auto">
-    <view class="nav-base bg-white fl single-text">
-      <text>合计：</text>
-      <text class="sales-price">￥{{total_price}}</text>
+    <!-- 支付方式 -->
+    <view a:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
+      <view class="item tc fl" a:for="{{payment_list}}">
+        <view class="item-content br {{(item.selected || '')}}" data-value="{{item.id}}" onTap="payment_event">
+          <image a:if="{{(item.logo || null) != null}}" class="icon" src="{{item.logo}}" mode="widthFix" />
+          <text>{{item.name}}</text>
+        </view>
+      </view>
     </view>
-    <view class="fr nav-submit">
-      <button class="bg-main wh-auto" type="default" onTap="buy_submit_event" disabled="{{buy_submit_disabled_status}}" hover-class="none">提交订单</button>
+
+    <!-- 导航 -->
+    <view class="buy-nav oh wh-auto">
+      <view class="nav-base bg-white fl single-text">
+        <text>合计：</text>
+        <text class="sales-price">￥{{total_price}}</text>
+      </view>
+      <view class="fr nav-submit">
+        <button class="bg-main wh-auto" type="default" onTap="buy_submit_event" disabled="{{buy_submit_disabled_status}}" hover-class="none">提交订单</button>
+      </view>
     </view>
   </view>
-</view>
 
-<view a:if="{{goods_list.length == 0}}">
-    <import src="/pages/common/nodata.axml" />
-    <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
-</view>
+  <view a:if="{{goods_list.length == 0}}">
+      <import src="/pages/common/nodata.axml" />
+      <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+  </view>
 
-<!-- 优惠劵选择 -->
-<popup show="{{popup_plugins_coupon_status}}" position="bottom" onClose="plugins_coupon_close_event">
-  <view class="plugins-coupon-popup bg-white">
-    <view class="close oh">
-      <view class="fr" catchTap="plugins_coupon_close_event">
-        <icon type="clear" size="20" />
-      </view>
-    </view>
-    <view a:if="{{(plugins_coupon_data || null) != null && plugins_coupon_data.coupon_list.length > 0}}" class="coupon-container oh br-b">
-      <view class="not-use-tips tc">
-        <text onTap="plugins_coupon_not_use_event">不使用优惠劵</text>
+  <!-- 优惠劵选择 -->
+  <popup show="{{popup_plugins_coupon_status}}" position="bottom" onClose="plugins_coupon_close_event">
+    <view class="plugins-coupon-popup bg-white">
+      <view class="close oh">
+        <view class="fr" catchTap="plugins_coupon_close_event">
+          <icon type="clear" size="20" />
+        </view>
       </view>
-      <block a:for="{{plugins_coupon_data.coupon_list}}">
-        <view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
-          <view class="v-left fl">
-            <view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
-              <text class="symbol">￥</text>
-              <text class="price">{{item.coupon.discount_value}}</text>
-              <text class="unit">{{item.coupon.type_unit}}</text>
-              <text a:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
+      <view a:if="{{(plugins_coupon_data || null) != null && plugins_coupon_data.coupon_list.length > 0}}" class="coupon-container oh br-b">
+        <view class="not-use-tips tc">
+          <text onTap="plugins_coupon_not_use_event">不使用优惠劵</text>
+        </view>
+        <block a:for="{{plugins_coupon_data.coupon_list}}">
+          <view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
+            <view class="v-left fl">
+              <view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
+                <text class="symbol">￥</text>
+                <text class="price">{{item.coupon.discount_value}}</text>
+                <text class="unit">{{item.coupon.type_unit}}</text>
+                <text a:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
+              </view>
+              <view a:if="{{(item.coupon.use_limit_type_name || null) != null}}" class="base-tips cr-666 single-text">{{item.coupon.use_limit_type_name}}</view>
+              <view class="base-time cr-888 single-text">{{item.time_start_text}} 至 {{item.time_end_text}}</view>
+            </view>
+            <view class="v-right fr" style="background:{{item.coupon.bg_color_value}};" data-index="{{index}}" data-value="{{item.id}}" onTap="plugins_coupon_use_event">
+              <text class="circle"></text>
+              <text>{{plugins_use_coupon_id == item.id ? '已选' : '选择'}}</text>
             </view>
-            <view a:if="{{(item.coupon.use_limit_type_name || null) != null}}" class="base-tips cr-666 single-text">{{item.coupon.use_limit_type_name}}</view>
-            <view class="base-time cr-888 single-text">{{item.time_start_text}} 至 {{item.time_end_text}}</view>
-          </view>
-          <view class="v-right fr" style="background:{{item.coupon.bg_color_value}};" data-index="{{index}}" data-value="{{item.id}}" onTap="plugins_coupon_use_event">
-            <text class="circle"></text>
-            <text>{{plugins_use_coupon_id == item.id ? '已选' : '选择'}}</text>
           </view>
-        </view>
-      </block>
+        </block>
+      </view>
     </view>
-  </view>
-</popup>
\ No newline at end of file
+  </popup>
+</block>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js
old mode 100755
new mode 100644
index f5ab76b07cf0ad8b771cd2e08c5ddd5c8b04c002..63b109c4a9e5dc3ba51f9b96c32381a8a1a56f85
--- a/public/appmini/old/alipay/pages/buy/buy.js
+++ b/public/appmini/old/alipay/pages/buy/buy.js
@@ -15,6 +15,8 @@ Page({
     extension_data: [],
     payment_id: 0,
     common_order_is_booking: 0,
+    common_site_type: 0,
+    extraction_address: [],
 
     // 优惠劵
     plugins_coupon_data: null,
@@ -23,6 +25,7 @@ Page({
     popup_plugins_coupon_status: false,
   },
   onLoad(params) {
+    //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
     if((params.data || null) == null || app.get_length(JSON.parse(params.data)) == 0)
     {
       my.alert({
@@ -49,6 +52,16 @@ Page({
 
   // 获取数据列表
   init() {
+    // 订单参数信息是否正确
+    if (this.data.params == null) {
+      this.setData({
+        data_list_loding_status: 2,
+        data_list_loding_msg: '订单信息有误',
+      });
+      my.stopPullDownRefresh();
+      return false;
+    }
+    
     // 本地缓存地址
     if(this.data.is_first == 0)
     {
@@ -59,12 +72,7 @@ Page({
       {
         this.setData({
           address: cache_address.data,
-          address_id: cache_address.data.id
-        });
-      } else {
-        this.setData({
-          address: null,
-          address_id: 0
+          address_id: cache_address.data.id || 0,
         });
       }
     }
@@ -100,6 +108,8 @@ Page({
               extension_data: data.extension_data || [],
               data_list_loding_status: 3,
               common_order_is_booking: data.common_order_is_booking || 0,
+              common_site_type: data.common_site_type || 0,
+              extraction_address: data.base.extraction_address || [],
               plugins_coupon_data: data.plugins_coupon_data || null,
             });
 
@@ -116,18 +126,14 @@ Page({
             }
 
             // 地址
-            if (this.data.address == null || this.data.address_id == 0) {
-              if((data.base.address || null) != null) {
-                this.setData({
-                  address: data.base.address,
-                  address_id: data.base.address.id,
-                });
-                my.setStorage({
-                  key: app.data.cache_buy_user_address_select_key,
-                  data: data.base.address,
-                });
-              }
-            }
+            this.setData({
+              address: data.base.address || null,
+              address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
+            });
+            my.setStorage({
+              key: app.data.cache_buy_user_address_select_key,
+              data: data.base.address || null,
+            });
 
             // 支付方式
             this.payment_list_data(data.payment_list);
@@ -137,7 +143,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -172,9 +180,11 @@ Page({
     data['coupon_id'] = this.data.plugins_use_coupon_id;
 
     // 数据验证
-    var validation = [
-      { fields: 'address_id', msg: '请选择地址' }
-    ];
+    var validation = [];
+    if (this.data.common_site_type == 0 || this.data.common_site_type  == 2)
+    {
+      validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 });
+    }
     if (this.data.common_order_is_booking != 1) {
       validation.push({ fields: 'payment_id', msg: '请选择支付方式' });
     }
@@ -264,4 +274,21 @@ Page({
     this.init();
   },
 
+  // 地址选择事件
+  address_event(e) {
+    if(this.data.common_site_type == 0)
+    {
+      my.navigateTo({
+        url: '/pages/user-address/user-address?is_back=1'
+      });
+    } else if (this.data.common_site_type == 2)
+    {
+      my.navigateTo({
+        url: '/pages/extraction-address/extraction-address?is_back=1'
+      });
+    } else {
+      app.showToast('当前模式不允许使用地址');
+    }
+  },
+
 });
diff --git a/public/appmini/old/alipay/pages/cart/cart.axml b/public/appmini/old/alipay/pages/cart/cart.axml
old mode 100755
new mode 100644
index e8a3295825998925c167eb642c9fa320d2056b34..8ae18ef07872ce8233c93b91898c650c27ca254f
--- a/public/appmini/old/alipay/pages/cart/cart.axml
+++ b/public/appmini/old/alipay/pages/cart/cart.axml
@@ -1,4 +1,4 @@
-<view a:if="{{data_list.length > 0}}" class="{{common_site_type == 1 ? '' : 'page'}}">
+<view a:if="{{data_list.length > 0}}" class="page">
   <view a:for="{{data_list}}" class="goods-item oh bg-white {{common_site_type == 1 ? 'exhibition-mode-data' : ''}}">
     <swipe-action index="{{index}}" restore="{{swipe_index === null || swipe_index !== index}}" right="{{item.right}}" onRightItemClick="right_item_event" onSwipeStart="swipe_start_event" extra="{{index}}">
       <!-- 选择 -->
diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js
index 98c3d5e54cff4f49ab19423f812db96cacdf24b1..d627e08212d6124fc3c5235235e421b1fdba99c1 100644
--- a/public/appmini/old/alipay/pages/cart/cart.js
+++ b/public/appmini/old/alipay/pages/cart/cart.js
@@ -104,7 +104,9 @@ Page({
             data_bottom_line_status: false,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/common/copyright.axml b/public/appmini/old/alipay/pages/common/copyright.axml
index fb8af85fbe7573de61d8a6b50b0083b6fcb2204b..592d7efe800aab0048953f2211b31ae5243c809a 100644
--- a/public/appmini/old/alipay/pages/common/copyright.axml
+++ b/public/appmini/old/alipay/pages/common/copyright.axml
@@ -1,5 +1,5 @@
 <template name="copyright">
   <view class="copyright">
-    <view class="text">Powered by ShopXO v1.7.0</view>
+    <view class="text">Powered by ShopXO v1.8.0</view>
   </view>
 </template>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/coupon/coupon.js b/public/appmini/old/alipay/pages/coupon/coupon.js
index 2482429765a60f932cca891212ce987e2b04fa04..489796a006a203958b6aeee10e428ee832a5e002 100644
--- a/public/appmini/old/alipay/pages/coupon/coupon.js
+++ b/public/appmini/old/alipay/pages/coupon/coupon.js
@@ -62,7 +62,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/extraction-address/extraction-address.acss b/public/appmini/old/alipay/pages/extraction-address/extraction-address.acss
new file mode 100644
index 0000000000000000000000000000000000000000..1bad1b348f223a2a5eadd13cbc64078619019a3c
--- /dev/null
+++ b/public/appmini/old/alipay/pages/extraction-address/extraction-address.acss
@@ -0,0 +1,24 @@
+.item {
+    padding: 10rpx 10rpx 0 10rpx;
+}
+.base, .address, .operation {
+    padding: 20rpx 0;
+}
+.address .item-icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-alias {
+  border: 1px solid #d2364c;
+  color: #d2364c;
+  padding: 2rpx 10rpx;
+  border-radius: 6rpx;
+  margin-right: 10rpx;
+}
+.address .text {
+    line-height: 44rpx;
+    width: calc(100% - 40rpx);
+}
+.operation .map-submit {
+    margin-left: 20rpx;
+}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/extraction-address/extraction-address.axml b/public/appmini/old/alipay/pages/extraction-address/extraction-address.axml
new file mode 100644
index 0000000000000000000000000000000000000000..7bf93d5fe2aefd908c07128d9d68960b153c45be
--- /dev/null
+++ b/public/appmini/old/alipay/pages/extraction-address/extraction-address.axml
@@ -0,0 +1,28 @@
+<view class="page">
+  <view a:if="{{data_list.length > 0}}">
+    <view class="item bg-white spacing-mb" a:for="{{data_list}}" a:key="key">
+      <view onTap="address_conent_event" data-index="{{index}}">
+        <view class="base oh">
+          <text a:if="{{(item.alias || null) != null}}" class="address-alias">{{item.alias}}</text>
+          <text>{{item.name}}</text>
+          <text class="fr">{{item.tel}}</text>
+        </view>
+        <view class="address oh">
+          <image class="item-icon fl" src="/images/user-address.png" mode="widthFix" />
+          <view class="text fr">{{item.province_name}}{{item.city_name}}{{item.county_name}}{{item.address}}</view>
+        </view>
+      </view>
+      <view class="operation br-t oh">
+        <button a:if="{{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>
+
+  <view a:if="{{data_list.length == 0}}">
+    <import src="/pages/common/nodata.axml" />
+    <template is="nodata" data="{{status: data_list_loding_status}}"></template>
+  </view>
+    
+  <import src="/pages/common/bottom_line.axml" />
+  <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
+</view>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/extraction-address/extraction-address.js b/public/appmini/old/alipay/pages/extraction-address/extraction-address.js
new file mode 100644
index 0000000000000000000000000000000000000000..cdb4b134507af1b41924b1d78d813db8a845a5fd
--- /dev/null
+++ b/public/appmini/old/alipay/pages/extraction-address/extraction-address.js
@@ -0,0 +1,139 @@
+const app = getApp();
+Page({
+  data: {
+    data_list_loding_status: 1,
+    data_bottom_line_status: false,
+    data_list: [],
+    params: null,
+    is_default: 0,
+  },
+
+  onLoad(params) {
+    this.setData({ params: params });
+  },
+
+  onShow() {
+    my.setNavigationBar({ title: app.data.common_pages_title.extraction_address });
+    this.init();
+  },
+
+  // 初始化
+  init() {
+    var user = app.get_user_cache_info(this, "init");
+    // 用户未绑定用户则转到登录页面
+    if (app.user_is_need_login(user)) {
+      my.redirectTo({
+        url: "/pages/login/login?event_callback=init"
+      });
+      return false;
+    } else {
+      // 获取数据
+      this.get_data_list();
+    }
+  },
+
+  // 获取数据列表
+  get_data_list() {
+    // 加载loding
+    my.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1
+    });
+
+    // 获取数据
+    my.request({
+      url: app.get_request_url("extraction", "useraddress"),
+      method: "POST",
+      data: {},
+      dataType: "json",
+      success: res => {
+        my.hideLoading();
+        my.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          if (res.data.data.length > 0) {
+            // 获取当前默认地址
+            var is_default = 0;
+            for (var i in res.data.data) {
+              if (res.data.data[i]['is_default'] == 1) {
+                is_default = res.data.data[i]['id'];
+              }
+            }
+
+            // 设置数据
+            this.setData({
+              data_list: res.data.data,
+              is_default: is_default,
+              data_list_loding_status: 3,
+              data_bottom_line_status: true,
+            });
+          } else {
+            this.setData({
+              data_list_loding_status: 0
+            });
+          }
+        } else {
+          this.setData({
+            data_list_loding_status: 0
+          });
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
+        }
+      },
+      fail: () => {
+        my.hideLoading();
+        my.stopPullDownRefresh();
+
+        this.setData({
+          data_list_loding_status: 2
+        });
+        app.showToast("服务器请求出错");
+      }
+    });
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.get_data_list();
+  },
+
+  // 地图查看
+  address_map_event(e) {
+    var index = e.currentTarget.dataset.index || 0;
+    var ads = this.data.data_list[index] || null;
+    if (ads == null)
+    {
+      app.showToast("地址有误");
+      return false;
+    }
+
+    var lng = parseFloat(ads.lng_gcj || 0);
+    var lat = parseFloat(ads.lat_gcj || 0);
+    if (lng <= 0 || lat <= 0) {
+      app.showToast("坐标有误");
+      return false;
+    }
+
+    my.openLocation({
+      latitude: lat,
+      longitude: lng,
+      scale: 18,
+      name: ads.alias || '',
+      address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
+    });
+  },
+
+  // 地址内容事件
+  address_conent_event(e) {
+    var index = e.currentTarget.dataset.index || 0;
+    var is_back = this.data.params.is_back || 0;
+    if (is_back == 1) {
+      my.setStorage({
+        key: app.data.cache_buy_user_address_select_key,
+        data: this.data.data_list[index]
+      });
+      my.navigateBack();
+    }
+  },
+
+});
diff --git a/public/appmini/old/alipay/pages/extraction-address/extraction-address.json b/public/appmini/old/alipay/pages/extraction-address/extraction-address.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed3a57db1414299558d96397899dde30bc79134f
--- /dev/null
+++ b/public/appmini/old/alipay/pages/extraction-address/extraction-address.json
@@ -0,0 +1,3 @@
+{
+  "pullRefresh": true
+}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/goods-comment/goods-comment.js b/public/appmini/old/alipay/pages/goods-comment/goods-comment.js
index ae6e3a6a70bb02a2cefc632ab86b9467f1bc0f68..713b8b33f518a6551355b4ca06c445aa274792dd 100644
--- a/public/appmini/old/alipay/pages/goods-comment/goods-comment.js
+++ b/public/appmini/old/alipay/pages/goods-comment/goods-comment.js
@@ -125,8 +125,9 @@ Page({
             this.setData({
               data_list_loding_status: 0
             });
-
-            app.showToast(res.data.msg);
+            if (app.is_login_check(res.data)) {
+              app.showToast(res.data.msg);
+            }
           }
         },
         fail: () => {
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
index 08034dd585072cc2a48b45123e18691edb32eeae..59dcc3273b0dc14d276ead8ab94025ad25cd2dde 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -198,7 +198,7 @@
 .goods-base .goods-price {
   padding-right: 100rpx;
   position: relative;
-  min-height: 80rpx;
+  min-height: 90rpx;
 }
 .goods-base .goods-price .original-price {
   margin-top: 10rpx;
@@ -230,6 +230,32 @@
   border-radius:1px;
 }
 
+/**
+ * 视频
+ */
+.goods-video {
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  text-align: center;
+  z-index:1;
+}
+.goods-video video {
+  width: 100%;
+  height: 65vh;
+}
+.goods-video-submit {
+  position: absolute;
+  left: 30rpx;
+  top: calc(65vh - 110rpx);
+  z-index: 2;
+}
+.goods-video-submit image {
+  width: 80rpx;
+  height: 80rpx;
+}
+
 
 /*
  * 限时秒杀 - 插件
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
index b8d78e7acc2307c41f80e8f0cf52656251a85a49..f64a5da3b477267767679e2f4fdf0dfc2a1c9b66 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -15,6 +15,17 @@
     </block>
   </swiper>
 
+  <!-- 视频 -->
+  <block a:if="{{goods.video.length > 0}}">
+    <view a:if="{{goods_video_is_autoplay}}" class="goods-video">
+      <video src="{{goods.video}}" autoplay="{{goods_video_is_autoplay}}" show-center-play-btn="{{true}}" controls="{{false}}" show-play-btn="{{false}}" enable-progress-gesture="{{false}}" show-fullscreen-btn="{{false}}"></video>
+    </view>
+    <view class="goods-video-submit">
+      <image a:if="{{!goods_video_is_autoplay}}" class="goods-video-play" onTap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
+      <image a:if="{{goods_video_is_autoplay}}" class="goods-video-close"  onTap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></image>
+    </view>
+  </block>
+
   <!-- 标题 -->
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
@@ -35,7 +46,7 @@
       </view>
       <text a:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view a:if="{{(goods.original_price || null) != null && goods.original_price > 0}}" class="original-price">￥{{goods.original_price}}</view>
+      <view a:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
@@ -194,6 +205,12 @@
     <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
 </view>
 
+<!-- 在线客服 -->
+<view a:if="{{common_app_is_online_service == 1}}">
+  <import src="/pages/lib/online-service/content.axml" />
+  <template is="online_service" data="{{tnt_inst_id: common_app_mini_alipay_tnt_inst_id || null, scene: common_app_mini_alipay_scene || null, openid: common_app_mini_alipay_openid || null}}"></template>
+</view>
+
 <!-- 购物车 -->
 <navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
   <view class="common-quick-nav quick-nav-cart">
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
index 2e6c49db7b296f802e15d855879d8d0e7faccd37..a2ba7ed71f13bb2b2bb976b3dc83b5d3d2b5d2ce 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -31,8 +31,16 @@ Page({
     goods_spec_base_images: '',
 
     show_field_price_text: null,
+
+    goods_video_is_autoplay: false,
     common_app_is_use_mobile_detail: 1,
 
+    // 在线客服
+    common_app_is_online_service: 0,
+    common_app_mini_alipay_tnt_inst_id: null,
+    common_app_mini_alipay_scene: null,
+    common_app_mini_alipay_openid: null,
+
     // 限时秒杀插件
     common_app_is_limitedtimediscount: 0,
     plugins_limitedtimediscount_data: null,
@@ -123,8 +131,19 @@ Page({
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
               plugins_coupon_data: data.plugins_coupon_data || null,
               quick_nav_cart_count: data.common_cart_total || 0,
+
+              // 在线客服
+              common_app_is_online_service: data.common_app_is_online_service || 0,
+              common_app_mini_alipay_tnt_inst_id: data.common_app_mini_alipay_tnt_inst_id || null,
+              common_app_mini_alipay_scene: data.common_app_mini_alipay_scene || null,
             });
 
+            // 在线客服开启，用户openid
+            if(this.data.common_app_is_online_service == 1)
+            {
+              this.setData({common_app_mini_alipay_openid: app.get_user_openid()});
+            }
+
             // 限时秒杀倒计时
             if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
               this.plugins_limitedtimediscount_countdown();
@@ -294,7 +313,9 @@ Page({
               });
               app.showToast(res.data.msg, 'success');
             } else {
-              app.showToast(res.data.msg);
+              if (app.is_login_check(res.data)) {
+                app.showToast(res.data.msg);
+              }
             }
           },
           fail: () => {
@@ -331,7 +352,9 @@ Page({
               this.popup_close_event();
               app.showToast(res.data.msg, 'success');
             } else {
-              app.showToast(res.data.msg);
+              if (app.is_login_check(res.data)) {
+                app.showToast(res.data.msg);
+              }
             }
           },
           fail: () => {
@@ -460,7 +483,9 @@ Page({
             this.setData({goods_specifications_choose: temp_data});
           }
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -515,7 +540,9 @@ Page({
             goods_spec_base_inventory: res.data.data.inventory,
           });
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -659,6 +686,16 @@ Page({
     });
   },
 
+  // 视频播放
+  goods_video_play_event(e) {
+    this.setData({ goods_video_is_autoplay: true});
+  },
+
+  // 视频关闭
+  goods_video_close_event(e) {
+    this.setData({ goods_video_is_autoplay: false });
+  },
+
   // 显示秒杀插件-倒计时
   plugins_limitedtimediscount_countdown() {
     // 销毁之前的任务
diff --git a/public/appmini/old/alipay/pages/index/index.axml b/public/appmini/old/alipay/pages/index/index.axml
index 859f8f076ff558ed6c9b4db446fbdbe408ee34a5..69ae712ad15cb021d642152f22f4ca0836730ecd 100644
--- a/public/appmini/old/alipay/pages/index/index.axml
+++ b/public/appmini/old/alipay/pages/index/index.axml
@@ -75,6 +75,12 @@
 <import src="/pages/common/bottom_line.axml" />
 <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
 
+<!-- 在线客服 -->
+<view a:if="{{common_app_is_online_service == 1}}">
+  <import src="/pages/lib/online-service/content.axml" />
+  <template is="online_service" data="{{tnt_inst_id: common_app_mini_alipay_tnt_inst_id || null, scene: common_app_mini_alipay_scene || null, openid: common_app_mini_alipay_openid || null}}"></template>
+</view>
+
 <!-- 版权 -->
 <view a:if="{{load_status == 1}}">
   <import src="/pages/common/copyright.axml" />
diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js
index 1f4d47ba2b08a68fdde4c8c6a58103777aefeaab..b76994d3396fb8380dbeef838274d35fce55a1e3 100644
--- a/public/appmini/old/alipay/pages/index/index.js
+++ b/public/appmini/old/alipay/pages/index/index.js
@@ -11,6 +11,12 @@ Page({
     common_app_is_enable_search: 1,
     common_app_is_enable_answer: 1,
     common_app_is_header_nav_fixed: 0,
+    
+    // 在线客服
+    common_app_is_online_service: 0,
+    common_app_mini_alipay_tnt_inst_id: null,
+    common_app_mini_alipay_scene: null,
+    common_app_mini_alipay_openid: null,
 
     // 限时秒杀插件
     common_app_is_limitedtimediscount : 0,
@@ -58,8 +64,19 @@ Page({
             data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
             common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
             plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+
+            // 在线客服
+            common_app_is_online_service: data.common_app_is_online_service || 0,
+            common_app_mini_alipay_tnt_inst_id: data.common_app_mini_alipay_tnt_inst_id || null,
+            common_app_mini_alipay_scene: data.common_app_mini_alipay_scene || null,
           });
 
+          // 在线客服开启，用户openid
+          if(this.data.common_app_is_online_service == 1)
+          {
+            this.setData({common_app_mini_alipay_openid: app.get_user_openid()});
+          }
+
           // 限时秒杀倒计时
           if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null)
           {
diff --git a/public/appmini/old/alipay/pages/lib/online-service/content.axml b/public/appmini/old/alipay/pages/lib/online-service/content.axml
new file mode 100644
index 0000000000000000000000000000000000000000..c725f002e321957d8908135362fa36aff4903b0a
--- /dev/null
+++ b/public/appmini/old/alipay/pages/lib/online-service/content.axml
@@ -0,0 +1,5 @@
+<template name="online_service">
+  <view a:if="{{(tnt_inst_id || null) != null && (scene || null) != null}}" class="common-quick-nav common-online-service">
+    <contact-button tnt-inst-id="{{tnt_inst_id}}" scene="{{scene}}" size="90rpx*90rpx" icon="/pages/lib/online-service/icon.png" alipay-card-no="{{openid || ''}}" />
+  </view>
+</template>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/lib/online-service/icon.png b/public/appmini/old/alipay/pages/lib/online-service/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0aaab3a28a40e92e95c8fe6c1c558b145b684fb
Binary files /dev/null and b/public/appmini/old/alipay/pages/lib/online-service/icon.png differ
diff --git a/public/appmini/old/alipay/pages/message/message.js b/public/appmini/old/alipay/pages/message/message.js
old mode 100755
new mode 100644
index df403a38856e413324d960bf0d60fd86a305d5a6..c4578ce96491dcdd125ec2e3bd903d24c5b6c086
--- a/public/appmini/old/alipay/pages/message/message.js
+++ b/public/appmini/old/alipay/pages/message/message.js
@@ -98,7 +98,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js
old mode 100755
new mode 100644
index 1449c0163eb1940102cc273d2069139f7ae8b497..e6dd48a4b66298c2ccb20e5f74028e1a62290d86
--- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js
@@ -108,7 +108,9 @@ Page({
               self.init_value();
             }, 500);
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-address/user-address.acss b/public/appmini/old/alipay/pages/user-address/user-address.acss
old mode 100755
new mode 100644
index dff6f15ed71e0e69a6d51cc0ebf3dbb15de42ed7..f495ab3fefa976c33e7f791b37c2c68ecfc521ac
--- a/public/appmini/old/alipay/pages/user-address/user-address.acss
+++ b/public/appmini/old/alipay/pages/user-address/user-address.acss
@@ -5,7 +5,7 @@
     padding: 20rpx 0;
 }
 .address .item-icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address .text {
diff --git a/public/appmini/old/alipay/pages/user-address/user-address.js b/public/appmini/old/alipay/pages/user-address/user-address.js
old mode 100755
new mode 100644
index e4424891c720a07d3fa91377df7c64526c04ed7a..480c5a2ecf1693cd75ae912538abd09450e27d57
--- a/public/appmini/old/alipay/pages/user-address/user-address.js
+++ b/public/appmini/old/alipay/pages/user-address/user-address.js
@@ -85,8 +85,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg, 'success');
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js b/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js
old mode 100755
new mode 100644
index b412f154044e46eda1ec26341501946df91cec69..d8f95005be5f33540eeb22f09abc264e845c3b38
--- a/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js
+++ b/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js
@@ -98,7 +98,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-coupon/user-coupon.js b/public/appmini/old/alipay/pages/user-coupon/user-coupon.js
index 9762ceb3ff4fd2b1a44aefbdd83c51545203a691..342c55ecaa034096b16fdda4c3f6b4529ddeb9e9 100644
--- a/public/appmini/old/alipay/pages/user-coupon/user-coupon.js
+++ b/public/appmini/old/alipay/pages/user-coupon/user-coupon.js
@@ -66,7 +66,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
old mode 100755
new mode 100644
index 5b946df26c5b0b73f2bca3a3ddbd48ea7e848db5..53953e704cc1b779d3c7e9d3d6b388c58f3340f2
--- a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
+++ b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js
@@ -96,7 +96,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js
old mode 100755
new mode 100644
index ac3af7034260f7aa2711a385cb8a6c749ceaf2d7..a96d44f630fde689064eb0cf8075603b101bb6e1
--- a/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js
+++ b/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js
@@ -95,7 +95,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-integral/user-integral.js b/public/appmini/old/alipay/pages/user-integral/user-integral.js
old mode 100755
new mode 100644
index cf96d362f6437fb84a620e6388de5cc8ae144ee5..be4a3ff28a2e22919f588add4caa47e0e14223b3
--- a/public/appmini/old/alipay/pages/user-integral/user-integral.js
+++ b/public/appmini/old/alipay/pages/user-integral/user-integral.js
@@ -98,7 +98,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js b/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js
index 40fe90e286e62b3cc6ebbf8b8314e5ae9edead0b..fc11e6ed930dd2d2dd34b3b6b230ac49bf2a0ff7 100644
--- a/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js
+++ b/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js
@@ -56,7 +56,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
old mode 100755
new mode 100644
index 6b8ded7a8a64ac6c4396e90f79b353b98111c6f6..176f325a21fef7958b0d9e649770a89c6a574a19
--- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
+++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
@@ -1,3 +1,6 @@
+/*
+ * 地址信息
+ */
 .address {
     padding: 10rpx;
 }
@@ -24,17 +27,20 @@
     line-height: 85rpx;
 }
 
+/*
+ * 商品信息
+ */
 .goods-base {
   min-height: 160rpx;
   margin-left: 180rpx;
 }
-.goods .goods-item:not(:last-child) {
-    border-bottom: 1px dashed #efefef;
+.goods .goods-item:last-child {
+    border-bottom: 0;
 }
 .goods-item {
     padding: 20rpx 10rpx;
 }
-.goods-title, .goods-spec {
+.goods-title, .goods-attribute {
     margin-bottom: 10rpx;
 }
 .goods-image {
@@ -50,26 +56,37 @@
     right: 0;
     bottom: 0;
 }
+.order-describe {
+  padding: 20rpx 10rpx;
+}
 
 /*
- * 基础信息
+ * 面板信息
  */
-.detail-list {
-    padding: 0 10rpx;
-}
-.detail-list .item {
+.panel-item .panel-title {
+  background: #fff;
+  font-weight: bold;
+  padding: 15rpx;
+  border-bottom: 2px solid #eee;
+  font-size: 34rpx;
+}
+.panel-item .panel-content .item {
     padding: 20rpx 0;
 }
-.detail-list .item .title {
+.panel-item .panel-content .item:last-child {
+  border: 0;
+}
+.panel-item .panel-content .item .title {
     width: 25%;
     padding-left: 20rpx;
 }
-.detail-list .item .content {
+.panel-item .panel-content .item .content {
     width: calc(75% - 50rpx);
     padding-left: 20rpx;
     min-height: 46rpx;
 }
-.detail-list .item view {
+.panel-item .panel-content .item .title,
+.panel-item .panel-content .item .content {
     line-height: 46rpx;
 }
 
@@ -84,4 +101,59 @@
 }
 .extension-list .item .content {
   padding-left: 20rpx;
+}
+
+/*
+ * 虚拟销售信息
+ */
+.site-fictitious .panel-content {
+  padding: 0 20rpx;
+}
+.site-fictitious .panel-content .tips-value {
+  color: #f37b1d;
+  background-color: #fff2e9;
+  border-color: #ffebdb;
+  padding: 10rpx;
+  margin-top: 20rpx;
+}
+.site-fictitious .panel-content .left-image {
+  width: 80rpx;
+  height: 80rpx;
+}
+.site-fictitious .panel-content .right-value,
+.site-fictitious .panel-content .right-value .rich-text-value {
+  width: calc(100% - 100rpx);
+}
+.site-fictitious .panel-content .item {
+  position: relative;
+}
+.site-fictitious .panel-content .right-value .rich-text-value {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+/*
+ * 自提信息
+ */
+.site-extraction .panel-content {
+  padding: 20rpx;
+}
+.site-extraction .panel-content .code {
+  background: #5eb95e;
+  color: #fff;
+}
+.site-extraction .panel-content .code,
+.address-map-submit {
+  padding: 1rpx 16rpx;
+  border-radius: 6rpx;
+}
+.site-extraction .panel-content .qrcode {
+  margin-top: 15rpx;
+  width: 300rpx;
+  height: 300rpx;
+}
+.address-map-submit {
+  margin-left: 20rpx;
+  background: #f5f5f5;
 }
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
old mode 100755
new mode 100644
index 9b6004c96295114a7eb196c3ae7d0e25d83af761..5c53b002d6dd6685bfef6f3aefa222f21dbcb70b
--- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
+++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
@@ -1,17 +1,22 @@
 <view a:if="{{detail != null}}">
-  <view class="address bg-white spacing-mb">
+  <!-- 地址 -->
+  <view a:if="{{detail.order_model == 0 || detail.order_model == 2}}" class="address bg-white spacing-mb">
       <view class="address-base oh">
-          <text>{{detail.receive_name}}</text>
-          <text class="fr">{{detail.receive_tel}}</text>
+          <text>{{detail.address_data.name}}</text>
+          <text class="fr">{{detail.address_data.tel}}</text>
       </view>
       <view class="address-detail oh">
           <image class="icon fl" src="/images/user-address.png" mode="widthFix" />
-          <view class="text fr">{{detail.receive_province_name}}{{detail.receive_city_name}}{{detail.receive_county_name}}{{detail.receive_address}}</view>
+          <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_gcj || 0) > 0 && (detail.address_data.lat_gcj || 0) > 0}}" class="cr-666 br address-map-submit" onTap="address_map_event">查看位置</text>
+          </view>
       </view>
   </view>
 
+  <!-- 商品列表 -->
   <view class="goods bg-white spacing-mb">
-      <view a:for="{{detail.items}}" class="goods-item oh">
+      <view a:for="{{detail.items}}" class="goods-item br-b-dashed oh">
         <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
           <image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
           <view class="goods-base">
@@ -29,13 +34,48 @@
           </view>
         </navigator>
       </view>
+      <view class="order-describe">{{detail.describe}}</view>
+  </view>
+
+  <!-- 虚拟销售数据 -->
+  <view a:if="{{detail.order_model == 3 && detail.pay_status == 1 && (detail.status == 3 || detail.status == 4)}}" class="panel-item spacing-mt site-fictitious">
+    <view class="panel-title">{{site_fictitious.title || '密钥信息'}}</view>
+    <view class="panel-content bg-white oh">
+      <view a:if="{{(site_fictitious.tips || null) != null}}" class="tips-value">
+        <rich-text nodes="{{site_fictitious.tips}}"></rich-text>
+      </view>
+      <view a:for="{{detail.items}}" class="item br-b-dashed oh">
+        <image class="left-image br fl" src="{{item.images}}" mode="aspectFill" />
+        <view class="right-value fr">
+          <view a:if="{{(item.fictitious_goods_value || null) != null}}" class="rich-text-value">
+            <rich-text nodes="{{item.fictitious_goods_value}}"></rich-text>
+          </view>
+          <text a:else class="cr-888">未配置数据</text>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 自提信息 -->
+  <view a:if="{{detail.order_model == 2 && (detail.status == 2 || detail.status == 3) && (detail.extraction_data || null) != null}}" class="panel-item spacing-mt site-extraction">
+    <view class="panel-title">取货信息</view>
+    <view class="panel-content bg-white oh">
+      <view>
+        <text>取货码：</text>
+        <text class="code">{{detail.extraction_data.code || '取货码不存在、请联系管理员'}}</text>
+      </view>
+      <image a:if="{{(detail.extraction_data.images || null) != null}}" class="br qrcode" src="{{detail.extraction_data.images}}" mode="aspectFill" />
+    </view>
   </view>
 
   <!-- 订单基础数据 -->
-  <view a:if="{{detail_list.length > 0}}" class="detail-list bg-white">
-    <view a:for="{{detail_list}}" class="item br-b oh">
-      <view class="title fl">{{item.name}}</view>
-      <view class="content cr-888 fl br-l">{{item.value}}</view>
+  <view a:if="{{detail_list.length > 0}}" class="panel-item spacing-mt">
+    <view class="panel-title">基础数据</view>
+    <view class="panel-content bg-white">
+      <view a:for="{{detail_list}}" class="item br-b oh">
+        <view class="title fl">{{item.name}}</view>
+        <view class="content cr-888 fl br-l">{{item.value}}</view>
+      </view>
     </view>
   </view>
 
diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js
old mode 100755
new mode 100644
index a51d8198632c729a4dab18ac3b68bb5761718d5a..2adfa54dfb64be7a7d5139c7d05cdb5412eacd65
--- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js
+++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js
@@ -1,4 +1,5 @@
 const app = getApp();
+import parse from 'mini-html-parser2';
 Page({
   data: {
     params: null,
@@ -9,9 +10,11 @@ Page({
     detail: null,
     detail_list: [],
     extension_data: [],
+    site_fictitious: null,
   },
 
   onLoad(params) {
+    //params['id'] = 7;
     this.setData({params: params});
     this.init();
   },
@@ -41,40 +44,78 @@ Page({
         if (res.data.code == 0) {
           var data = res.data.data;
           self.setData({
-            detail: data,
+            detail: data.data,
             detail_list:[
-              {name: "订单号", value: data.order_no || ''},
-              {name: "状态", value: data.status_name || ''},
-              {name: "支付状态", value: data.pay_status_name || ''},
-              {name: "单价", value: data.price || ''},
-              {name: "总价", value: data.total_price || ''},
-              {name: "优惠金额", value: data.preferential_price || ''},
-              {name: "增加金额", value: data.increase_price || '' },
-              {name: "支付金额", value: data.pay_price || ''},
-              {name: "支付方式", value: data.payment_name || ''},
-              {name: "快递公司", value: data.express_name || ''},
-              {name: "快递单号", value: data.express_number || ''},
-              {name: "用户留言", value: data.user_note || ''},
-              {name: "创建时间", value: data.add_time || ''},
-              {name: "确认时间", value: data.confirm_time || ''},
-              {name: "支付时间", value: data.pay_time || ''},
-              {name: "发货时间", value: data.delivery_time || ''},
-              {name: "收货时间", value: data.collect_time || ''},
-              {name: "取消时间", value: data.close_time || ''},
-              {name: "关闭时间", value: data.close_time || ''},
+              {name: "订单号", value: data.data.order_no || ''},
+              {name: "订单模式", value: data.data.order_model_name || '' },
+              {name: "状态", value: data.data.status_name || ''},
+              {name: "支付状态", value: data.data.pay_status_name || ''},
+              {name: "单价", value: data.data.price || ''},
+              {name: "总价", value: data.data.total_price || ''},
+              {name: "优惠金额", value: data.data.preferential_price || ''},
+              {name: "增加金额", value: data.data.increase_price || '' },
+              {name: "支付金额", value: data.data.pay_price || ''},
+              {name: "支付方式", value: data.data.payment_name || ''},
+              {name: "快递公司", value: data.data.express_name || ''},
+              {name: "快递单号", value: data.data.express_number || ''},
+              {name: "用户留言", value: data.data.user_note || ''},
+              {name: "创建时间", value: data.data.add_time || ''},
+              {name: "确认时间", value: data.data.confirm_time || ''},
+              {name: "支付时间", value: data.data.pay_time || ''},
+              {name: "发货时间", value: data.data.delivery_time || ''},
+              {name: "收货时间", value: data.data.collect_time || ''},
+              {name: "取消时间", value: data.data.close_time || ''},
+              {name: "关闭时间", value: data.data.close_time || ''},
             ],
-            extension_data: data.extension_data || [],
+            extension_data: data.data.extension_data || [],
+            site_fictitious: data.site_fictitious || null,
             data_list_loding_status: 3,
             data_bottom_line_status: true,
             data_list_loding_msg: '',
           });
+
+          // web内容转化
+          if(data.data.order_model == 3 && data.data.pay_status == 1 && (data.data.status == 3 || data.data.status == 4))
+          {
+            // 密钥信息
+            var items = data.data.items;
+            for(var i in items)
+            {
+              var value = items[i]['fictitious_goods_value'] || null;
+              if(value != null)
+              {
+                parse(value, (err, nodes) => {
+                  if (!err) {
+                    items[i]['fictitious_goods_value'] = nodes;
+                  }
+                });
+              }
+            }
+
+            // 提示信息
+            var tips = data.site_fictitious.tips || null;
+            if(tips != null)
+            {
+              parse(tips, (err, nodes) => {
+                if (!err) {
+                  tips = nodes;
+                }
+              });
+            }
+            this.setData({
+              'detail.items': items,
+              'site_fictitious.tips': tips,
+            });
+          }
         } else {
           self.setData({
             data_list_loding_status: 2,
             data_bottom_line_status: false,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -90,6 +131,31 @@ Page({
     });
   },
 
+  // 地图查看
+  address_map_event(e) {
+    if ((this.data.detail.address_data || null) == null)
+    {
+      app.showToast("地址有误");
+      return false;
+    }
+
+    var ads = this.data.detail.address_data;
+    var lng = parseFloat(ads.lng_gcj || 0);
+    var lat = parseFloat(ads.lat_gcj || 0);
+    if (lng <= 0 || lat <= 0) {
+      app.showToast("坐标有误");
+      return false;
+    }
+
+    my.openLocation({
+      latitude: lat,
+      longitude: lng,
+      scale: 18,
+      name: ads.alias || '',
+      address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
+    });
+  },
+
   // 下拉刷新
   onPullDownRefresh() {
     this.init();
diff --git a/public/appmini/old/alipay/pages/user-order/user-order.acss b/public/appmini/old/alipay/pages/user-order/user-order.acss
old mode 100755
new mode 100644
index df969ce9286240263b4ed2d6efdea82bd9062f80..fec425ecb3e57deb6486e98825dcfe8dd092518f
--- a/public/appmini/old/alipay/pages/user-order/user-order.acss
+++ b/public/appmini/old/alipay/pages/user-order/user-order.acss
@@ -24,7 +24,7 @@
 .goods-title {
     line-height: 36rpx;
 }
-.list-item .goods-item:not(:last-child) {
+.list-item .goods-item:last-child {
     border-bottom: 1px dashed #efefef;
 }
 .goods-item {
diff --git a/public/appmini/old/alipay/pages/user-order/user-order.axml b/public/appmini/old/alipay/pages/user-order/user-order.axml
old mode 100755
new mode 100644
index 35147a5c4e6930112b2d5e89759b1c5697d779e8..83753f7e2cdca9209cc37681e204b04ca6c643b7
--- a/public/appmini/old/alipay/pages/user-order/user-order.axml
+++ b/public/appmini/old/alipay/pages/user-order/user-order.axml
@@ -14,7 +14,7 @@
         <text class="cr-666">{{item.add_time}}</text>
         <text class="fr cr-main">{{item.status_name}}</text>
       </view>
-      <view a:for="{{item.items}}" a:for-item="detail" class="goods-item oh">
+      <view a:for="{{item.items}}" a:for-item="detail" class="goods-item br-b-dashed oh">
         <navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}" hover-class="none">
           <image class="goods-image fl" src="{{detail.images}}" mode="aspectFill" />
           <view class="goods-base">
@@ -34,10 +34,10 @@
         </navigator>
       </view>
       <view class="item-describe tr cr-666">{{item.describe}}</view>
-      <view a:if="{{item.status <= 3 || (item.status == 4 && item.user_is_comments == 0)}}" class="item-operation tr br-t">
+      <view a:if="{{item.status == 1 || item.status == 3 || (item.status == 4 && item.user_is_comments == 0) || (item.status == 2 && item.order_model != 2)}}" class="item-operation tr br-t">
         <button a:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" onTap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
         <button a:if="{{item.status == 1}}" class="submit-pay cr-666" type="default" size="mini" onTap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付</button>
-        <button a:if="{{item.status == 2}}" class="submit-rush cr-666" type="default" size="mini" onTap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催</button>
+        <button a:if="{{item.status == 2 && item.order_model != 2}}" class="submit-rush cr-666" type="default" size="mini" onTap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催</button>
         <button a:if="{{item.status == 3}}" class="submit-success cr-666" type="default" size="mini" onTap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货</button>
         <button a:if="{{item.status == 4 && item.user_is_comments == 0}}" class="submit-success cr-666 br" type="default" size="mini" onTap="comments_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">评论</button>
       </view>
diff --git a/public/appmini/old/alipay/pages/user-order/user-order.js b/public/appmini/old/alipay/pages/user-order/user-order.js
old mode 100755
new mode 100644
index adef39869dd86d1156c338510fe41370c2330b10..cc1f4904af39d1681d56fee575579b9ba612a192
--- a/public/appmini/old/alipay/pages/user-order/user-order.js
+++ b/public/appmini/old/alipay/pages/user-order/user-order.js
@@ -164,7 +164,9 @@ Page({
             data_list_loding_status: 0,
             load_status: 1,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 5a55740d9388f60e9b6e9e01a01d6d18d6d31ff9..ec696f988ca2125e119bb9ade719a136248a0d8b 100644
--- a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -166,7 +166,9 @@ Page({
             data_bottom_line_status: false,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
index 2027c2f37afa3aaf8dd6c18088bcad3bae20987a..8f88d32cddc5a1bc0c2c46f2c900098715cf2882 100644
--- a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
+++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js
@@ -134,8 +134,9 @@ Page({
             data_list_loding_status: 0,
             data_list_loding_msg: res.data.msg,
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/alipay/pages/user/user.axml b/public/appmini/old/alipay/pages/user/user.axml
index 07951fa4cbad02672bfd5a1700bee217f05a6bbc..e074cd306f653ec8b555207235ec4d4333e4dc6c 100644
--- a/public/appmini/old/alipay/pages/user/user.axml
+++ b/public/appmini/old/alipay/pages/user/user.axml
@@ -70,6 +70,12 @@
     <view class="tips">{{common_user_center_notice}}</view>
 </view>
 
+<!-- 在线客服 -->
+<view a:if="{{common_app_is_online_service == 1}}">
+  <import src="/pages/lib/online-service/content.axml" />
+  <template is="online_service" data="{{tnt_inst_id: common_app_mini_alipay_tnt_inst_id || null, scene: common_app_mini_alipay_scene || null, openid: common_app_mini_alipay_openid || null}}"></template>
+</view>
+
 <!-- 版权 -->
 <import src="/pages/common/copyright.axml" />
 <template is="copyright"></template>
diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js
index 83169be09c915e2e07351346ef15588b323ae01d..40110220af997140b9b947ffe3af2681cf42dd8d 100644
--- a/public/appmini/old/alipay/pages/user/user.js
+++ b/public/appmini/old/alipay/pages/user/user.js
@@ -23,6 +23,13 @@ Page({
     // 远程自定义导航
     navigation: [],
 
+    // 在线客服
+    common_app_is_online_service: 0,
+    common_app_mini_alipay_tnt_inst_id: null,
+    common_app_mini_alipay_scene: null,
+    common_app_mini_alipay_openid: null,
+
+    // 是否启用头部小导航
     common_app_is_head_vice_nav: 0,
   },
 
@@ -104,9 +111,22 @@ Page({
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
             common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
+
+            // 在线客服
+            common_app_is_online_service: data.common_app_is_online_service || 0,
+            common_app_mini_alipay_tnt_inst_id: data.common_app_mini_alipay_tnt_inst_id || null,
+            common_app_mini_alipay_scene: data.common_app_mini_alipay_scene || null,
           });
+
+          // 在线客服开启，用户openid
+          if(this.data.common_app_is_online_service == 1)
+          {
+            this.setData({common_app_mini_alipay_openid: app.get_user_openid()});
+          }
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/baidu/pages/common/copyright.swan b/public/appmini/old/baidu/pages/common/copyright.swan
index fb8af85fbe7573de61d8a6b50b0083b6fcb2204b..592d7efe800aab0048953f2211b31ae5243c809a 100755
--- a/public/appmini/old/baidu/pages/common/copyright.swan
+++ b/public/appmini/old/baidu/pages/common/copyright.swan
@@ -1,5 +1,5 @@
 <template name="copyright">
   <view class="copyright">
-    <view class="text">Powered by ShopXO v1.7.0</view>
+    <view class="text">Powered by ShopXO v1.8.0</view>
   </view>
 </template>
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
index d32fad3107fa3721f919b48d12b17f2f2ea773d4..dbdc6b2a1cd5e10b6cd158fe2311b1b769716b85 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
@@ -196,7 +196,7 @@
 .goods-base .goods-price {
   padding-right: 100rpx;
   position: relative;
-  min-height: 80rpx;
+  min-height: 90rpx;
 }
 .goods-base .goods-price .original-price {
   margin-top: 8rpx;
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
index 13d32e7cf44bf79f46513db9ab4a66a271f0aba4..d5f2cfaf81c1419de641348edf84ee5b12b8aa19 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
@@ -39,7 +39,7 @@
       </view>
       <text s-if="(show_field_price_text || null) != null" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view s-if="(goods.original_price || null) != null && goods.original_price > 0" class="original-price">￥{{goods.original_price}}</view>
+      <view s-if="(goods.original_price || null) != null && goods.original_price != '0.00'" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
diff --git a/public/appmini/old/qq/pages/common/copyright.qml b/public/appmini/old/qq/pages/common/copyright.qml
index fb8af85fbe7573de61d8a6b50b0083b6fcb2204b..592d7efe800aab0048953f2211b31ae5243c809a 100755
--- a/public/appmini/old/qq/pages/common/copyright.qml
+++ b/public/appmini/old/qq/pages/common/copyright.qml
@@ -1,5 +1,5 @@
 <template name="copyright">
   <view class="copyright">
-    <view class="text">Powered by ShopXO v1.7.0</view>
+    <view class="text">Powered by ShopXO v1.8.0</view>
   </view>
 </template>
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
index ee49e6642f503b2ca1ff9774b1692d3efafbc4b8..c0d25d5257956470c55a458a999393931ae92e8e 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
@@ -46,7 +46,7 @@
       </view>
       <text qq:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view qq:if="{{(goods.original_price || null) != null && goods.original_price > 0}}" class="original-price">￥{{goods.original_price}}</view>
+      <view qq:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.qss b/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
index 4d0f904da3ed70632b81518be4935515ab675fd1..c8fc2dc29f4ba428c87bacbdffc4b39744eee7a5 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
@@ -197,7 +197,7 @@
 .goods-base .goods-price {
   padding-right: 100rpx;
   position: relative;
-  min-height: 80rpx;
+  min-height: 90rpx;
 }
 .goods-base .goods-price .original-price {
   margin-top: 8rpx;
diff --git a/public/appmini/old/toutiao/pages/common/copyright.ttml b/public/appmini/old/toutiao/pages/common/copyright.ttml
index fb8af85fbe7573de61d8a6b50b0083b6fcb2204b..592d7efe800aab0048953f2211b31ae5243c809a 100755
--- a/public/appmini/old/toutiao/pages/common/copyright.ttml
+++ b/public/appmini/old/toutiao/pages/common/copyright.ttml
@@ -1,5 +1,5 @@
 <template name="copyright">
   <view class="copyright">
-    <view class="text">Powered by ShopXO v1.7.0</view>
+    <view class="text">Powered by ShopXO v1.8.0</view>
   </view>
 </template>
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
index b44d775640fa79da5ec25ffabb8397b1ce7ecfaa..2a64d0c46d12758eae16d2e7c8bfb61c6a01ad59 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
@@ -46,7 +46,7 @@
       </view>
       <text tt:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view tt:if="{{(goods.original_price || null) != null && goods.original_price > 0}}" class="original-price">￥{{goods.original_price}}</view>
+      <view tt:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
index 4d0f904da3ed70632b81518be4935515ab675fd1..c8fc2dc29f4ba428c87bacbdffc4b39744eee7a5 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
@@ -197,7 +197,7 @@
 .goods-base .goods-price {
   padding-right: 100rpx;
   position: relative;
-  min-height: 80rpx;
+  min-height: 90rpx;
 }
 .goods-base .goods-price .original-price {
   margin-top: 8rpx;
diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js
index c76d45d7a32e5019528d41fd0f36b451fd246c6c..032af9fdd4f1c05bab4a5803b5158a65cd9c770c 100755
--- a/public/appmini/old/weixin/pages/buy/buy.js
+++ b/public/appmini/old/weixin/pages/buy/buy.js
@@ -117,7 +117,6 @@ Page({
               address: data.base.address || null,
               address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
             });
-
             wx.setStorage({
               key: app.data.cache_buy_user_address_select_key,
               data: data.base.address || null,
diff --git a/public/appmini/old/weixin/pages/buy/buy.wxml b/public/appmini/old/weixin/pages/buy/buy.wxml
index 59528ec904c8343edf6518a6d3249a2bb1b5fd47..5772fb84c6f4daeb13a251efe66154c9ee941a45 100755
--- a/public/appmini/old/weixin/pages/buy/buy.wxml
+++ b/public/appmini/old/weixin/pages/buy/buy.wxml
@@ -9,6 +9,7 @@
       <view class="address bg-white arrow-right" bindtap="address_event">
         <view wx:if="{{address != null}}">
           <view class="address-base oh">
+            <text wx:if="{{(address.alias || null) != null}}" class="address-alias">{{address.alias}}</text>
             <text>{{address.name}}</text>
             <text class="fr">{{address.tel}}</text>
           </view>
diff --git a/public/appmini/old/weixin/pages/buy/buy.wxss b/public/appmini/old/weixin/pages/buy/buy.wxss
index 8e4fb8d5a03897ce15edb186e809b5e913a66fd7..c3283e906982f64dcc48368ef7ffabdfd2dd08b2 100755
--- a/public/appmini/old/weixin/pages/buy/buy.wxss
+++ b/public/appmini/old/weixin/pages/buy/buy.wxss
@@ -12,7 +12,7 @@
     padding: 10rpx 35rpx 10rpx 10rpx;
 }
 .address-detail .icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-detail .text {
@@ -30,6 +30,13 @@
     height: 85rpx;
     line-height: 85rpx;
 }
+.address-alias {
+  border: 1px solid #d2364c;
+  color: #d2364c;
+  padding: 2rpx 10rpx;
+  border-radius: 6rpx;
+  margin-right: 10rpx;
+}
 
 /**
  * 商品
diff --git a/public/appmini/old/weixin/pages/common/copyright.wxml b/public/appmini/old/weixin/pages/common/copyright.wxml
index fb8af85fbe7573de61d8a6b50b0083b6fcb2204b..592d7efe800aab0048953f2211b31ae5243c809a 100755
--- a/public/appmini/old/weixin/pages/common/copyright.wxml
+++ b/public/appmini/old/weixin/pages/common/copyright.wxml
@@ -1,5 +1,5 @@
 <template name="copyright">
   <view class="copyright">
-    <view class="text">Powered by ShopXO v1.7.0</view>
+    <view class="text">Powered by ShopXO v1.8.0</view>
   </view>
 </template>
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/extraction-address/extraction-address.wxss b/public/appmini/old/weixin/pages/extraction-address/extraction-address.wxss
index 97e507dfdeac59fe1699d6ec4ae24e8d7629f41b..1bad1b348f223a2a5eadd13cbc64078619019a3c 100644
--- a/public/appmini/old/weixin/pages/extraction-address/extraction-address.wxss
+++ b/public/appmini/old/weixin/pages/extraction-address/extraction-address.wxss
@@ -5,7 +5,7 @@
     padding: 20rpx 0;
 }
 .address .item-icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-alias {
diff --git a/public/appmini/old/weixin/pages/goods-category/goods-category.js b/public/appmini/old/weixin/pages/goods-category/goods-category.js
index 50940d90b8818e5c55508230a57ad7296711ce5c..0ac0bd6fda8acc2d3ae3a994518c1358bb9513c4 100755
--- a/public/appmini/old/weixin/pages/goods-category/goods-category.js
+++ b/public/appmini/old/weixin/pages/goods-category/goods-category.js
@@ -50,7 +50,6 @@ Page({
               data_list_loding_status: 0,
               data_bottom_line_status: true,
             });
-
             app.showToast(res.data.msg);
           }
       },
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 98fa7ce2827cd75f964b1d29e745b4203cf383bc..a5c0aebe3ea8abd599b3df60b3e29115537dcbc0 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -482,7 +482,9 @@ Page({
             this.setData({goods_specifications_choose: temp_data});
           }
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
@@ -536,7 +538,9 @@ Page({
             goods_spec_base_inventory: res.data.data.inventory,
           });
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index d9c268c8ec0727ced484365958b7c062eb0cf8cf..ff6f61a04528a700950635343f98f0f0f1cf1286 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -44,7 +44,7 @@
       </view>
       <text wx:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view wx:if="{{(goods.original_price || null) != null && goods.original_price > 0}}" class="original-price">￥{{goods.original_price}}</view>
+      <view wx:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index d68c160af632237cf02d0e098f4da08534282566..f643621f2fe69715ac71f682bcfc8642da828087 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -196,7 +196,7 @@
 .goods-base .goods-price {
   padding-right: 100rpx;
   position: relative;
-  min-height: 80rpx;
+  min-height: 90rpx;
 }
 .goods-base .goods-price .original-price {
   margin-top: 8rpx;
diff --git a/public/appmini/old/weixin/pages/message/message.js b/public/appmini/old/weixin/pages/message/message.js
index 250b8d8538e9ffed462ecaa88ace8ab6d059a90d..e300156f4cbd4e9d476798ab7a8e9bd42fec3aa4 100755
--- a/public/appmini/old/weixin/pages/message/message.js
+++ b/public/appmini/old/weixin/pages/message/message.js
@@ -91,8 +91,9 @@ Page({
           this.setData({
             data_list_loding_status: 0
           });
-
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/weixin/pages/user-address-save/user-address-save.js b/public/appmini/old/weixin/pages/user-address-save/user-address-save.js
index abfed87720187f86dc8af128489d3b3a6a67a81f..1f9c0d82c155f7e7c6f9ba60783150c21d1c2c64 100755
--- a/public/appmini/old/weixin/pages/user-address-save/user-address-save.js
+++ b/public/appmini/old/weixin/pages/user-address-save/user-address-save.js
@@ -89,7 +89,9 @@ Page({
               self.init_value();
             }, 500);
         } else {
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/weixin/pages/user-address/user-address.wxss b/public/appmini/old/weixin/pages/user-address/user-address.wxss
index 40b41e033fdb8348c9dfe29d2d9bc4b3ad24cf2b..38c61d6be1ed15a769932ef58aefa07e30cfdced 100755
--- a/public/appmini/old/weixin/pages/user-address/user-address.wxss
+++ b/public/appmini/old/weixin/pages/user-address/user-address.wxss
@@ -5,7 +5,7 @@
     padding: 20rpx 0;
 }
 .address .item-icon {
-    width: 35rpx;
+    width: 30rpx;
     height: 35rpx !important;
 }
 .address-alias {
diff --git a/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js
index c0c55b3a23336bfb3901d11ed0f4993bba0f1356..eb1867de9fc32a07d2798db40afd4be93d513fde 100644
--- a/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js
+++ b/public/appmini/old/weixin/pages/user-order-comments/user-order-comments.js
@@ -56,7 +56,9 @@ Page({
             data_list_loding_status: 2,
             data_list_loding_msg: res.data.msg,
           });
-          app.showToast(res.data.msg);
+          if (app.is_login_check(res.data)) {
+            app.showToast(res.data.msg);
+          }
         }
       },
       fail: () => {
diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
index 182c22c937d884a980368ebb27187af62e1bdc0f..e4f9d9e2d8b0a145310797cfb1b344abb8858bf8 100755
--- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
+++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
@@ -9,7 +9,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.status == 2 || detail.status == 3) && (detail.address_data.lng_gcj || 0) > 0 && (detail.address_data.lat_gcj || 0) > 0}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
+            <text wx:if="{{detail.order_model == 2 && (detail.address_data.lng_gcj || 0) > 0 && (detail.address_data.lat_gcj || 0) > 0}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
           </view>
       </view>
   </view>
diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
index 593a2abed6ab3fe6ea3a46d443eed23d6ea8e230..a6560e6775b418df2a30f915060203e491afece0 100755
--- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
+++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
@@ -1,3 +1,6 @@
+/*
+ * 地址信息
+ */
 .address {
     padding: 10rpx;
 }
@@ -24,6 +27,9 @@
     line-height: 85rpx;
 }
 
+/*
+ * 商品信息
+ */
 .goods-base {
   min-height: 160rpx;
   margin-left: 180rpx;