小程序支持商品类型

application/api/controller/User.php

@@ -16,6 +16,9 @@ use app\service\GoodsService;
 use app\service\MessageService;
 use app\service\AppCenterNavService;
 use app\service\BuyService;
+use app\service\GoodsFavorService;
+use app\service\GoodsBrowseService;
+use app\service\IntegralService;
 
 /**
  * 用户
@@ -518,11 +521,11 @@ class User extends Common
 
         // 商品收藏总数
         $where = ['user_id'=>$this->user['id']];
-        $user_goods_favor_count = GoodsService::GoodsFavorTotal($where);
+        $user_goods_favor_count = GoodsFavorService::GoodsFavorTotal($where);
 
         // 商品浏览总数
         $where = ['user_id'=>$this->user['id']];
-        $user_goods_browse_count = GoodsService::GoodsBrowseTotal($where);
+        $user_goods_browse_count = GoodsBrowseService::GoodsBrowseTotal($where);
 
         // 未读消息总数
         $params = ['user'=>$this->user, 'is_more'=>1, 'is_read'=>0];
@@ -531,9 +534,13 @@ class User extends Common
         // 用户订单状态
         $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1, 'is_aftersale'=>1]);
 
+        // 用户积分
+        $user_integral_data = IntegralService::UserIntegral($params['user']['id']);
+        $user_integral = (isset($user_integral_data['data']) && isset($user_integral_data['data']['integral'])) ? $user_integral_data['data']['integral'] : 0;
+
         // 初始化数据
         $result = array(
-            'integral'                          => (int) $this->user['integral'],
+            'integral'                          => $user_integral,
             'avatar'                            => $this->user['avatar'],
             'nickname'                          => $this->user['nickname'],
             'username'                          => $this->user['username'],

application/api/controller/Usergoodsbrowse.php

@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 namespace app\api\controller;
 
-use app\service\GoodsService;
+use app\service\GoodsBrowseService;
 
 /**
  * 用户商品浏览
@@ -56,10 +56,10 @@ class UserGoodsBrowse extends Common
         $page = max(1, isset($this->data_post['page']) ? intval($this->data_post['page']) : 1);
 
         // 条件
-        $where = GoodsService::UserGoodsBrowseListWhere($params);
+        $where = GoodsBrowseService::UserGoodsBrowseListWhere($params);
 
         // 获取总数
-        $total = GoodsService::GoodsBrowseTotal($where);
+        $total = GoodsBrowseService::GoodsBrowseTotal($where);
         $page_total = ceil($total/$number);
         $start = intval(($page-1)*$number);
 
@@ -69,7 +69,7 @@ class UserGoodsBrowse extends Common
             'n'         => $number,
             'where'     => $where,
         );
-        $data = GoodsService::GoodsBrowseList($data_params);
+        $data = GoodsBrowseService::GoodsBrowseList($data_params);
         
         // 返回数据
         $result = [
@@ -92,7 +92,7 @@ class UserGoodsBrowse extends Common
     {
         $params = $this->data_post;
         $params['user'] = $this->user;
-        return GoodsService::GoodsBrowseDelete($params);
+        return GoodsBrowseService::GoodsBrowseDelete($params);
     }
 }
 ?>
\ No newline at end of file

application/index/controller/User.php

@@ -95,7 +95,7 @@ class User extends Common
         $this->assign('common_message_total', $common_message_total);
 
         // 获取进行中的订单列表
-        $params = array_merge($_POST, $_GET);
+        $params = $this->data_request;
         $params['user'] = $this->user;
         $params['is_more'] = 1;
         $params['status'] = [1,2,3,4];

application/index/view/default/goods/index.html

@@ -312,7 +312,7 @@
             </div>
 
             <!-- 购买导航 -->
-            <div class="buy-nav {{if $common_site_type eq 1}} exhibition-nav{{/if}} {{if isset($is_goods_site_type_consistent) and $is_goods_site_type_consistent neq 1 and $common_site_type neq 1}} site-type-not-consistent-nav{{/if}}">
+            <div class="buy-nav {{if $common_site_type eq 1}}exhibition-nav{{else /}}{{if isset($is_goods_site_type_consistent) and $is_goods_site_type_consistent neq 1}}site-type-not-consistent-nav{{/if}}{{/if}}">
                 {{if !empty($goods.is_shelves)}}
                     {{if $goods['inventory'] gt 0}}
                         <div class="buy-nav-opt">

application/service/AppCenterNavService.php

@@ -34,7 +34,7 @@ class AppCenterNavService
     {
         $where = empty($params['where']) ? [] : $params['where'];
         $field = empty($params['field']) ? '*' : $params['field'];
-        $order_by = empty($params['order_by']) ? 'sort asc' : trim($params['order_by']);
+        $order_by = empty($params['order_by']) ? 'sort asc, id asc' : trim($params['order_by']);
 
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
@@ -277,7 +277,7 @@ class AppCenterNavService
     {
         $client_type = (APPLICATION_CLIENT_TYPE == 'pc') ? (IsMobile() ? 'h5' : 'pc') : APPLICATION_CLIENT_TYPE;
         $field = 'id,name,images_url,event_value,event_type,desc';
-        $order_by = 'sort asc,id desc';
+        $order_by = 'sort asc,id asc';
         $data = Db::name('AppCenterNav')->field($field)->where(['platform'=>$client_type, 'is_enable'=>1])->order($order_by)->select();
         if(!empty($data))
         {

application/service/AppHomeNavService.php

@@ -34,7 +34,7 @@ class AppHomeNavService
     {
         $where = empty($params['where']) ? [] : $params['where'];
         $field = empty($params['field']) ? '*' : $params['field'];
-        $order_by = empty($params['order_by']) ? 'sort asc,id desc' : trim($params['order_by']);
+        $order_by = empty($params['order_by']) ? 'sort asc,id asc' : trim($params['order_by']);
 
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
@@ -287,7 +287,7 @@ class AppHomeNavService
         {
             // 获取导航数据
             $field = 'id,name,images_url,event_value,event_type,bg_color,is_need_login';
-            $order_by = 'sort asc,id desc';
+            $order_by = 'sort asc,id asc';
             $data = Db::name('AppHomeNav')->field($field)->where(['platform'=>$platform, 'is_enable'=>1])->order($order_by)->select();
             if(!empty($data))
             {

application/service/BannerService.php

@@ -50,7 +50,7 @@ class BannerService
         {
             // 获取banner数据
             $field = 'name,images_url,event_value,event_type,bg_color';
-            $order_by = 'sort asc,id desc';
+            $order_by = 'sort asc,id asc';
             $data = Db::name('Slide')->field($field)->where(['platform'=>$platform, 'is_enable'=>1])->order($order_by)->select();
             if(!empty($data))
             {

application/service/NavigationService.php

@@ -118,7 +118,7 @@ class NavigationService
     {
         // 获取导航数据
         $field = 'id,pid,name,url,value,data_type,is_new_window_open';
-        $order_by = 'sort asc,id desc';
+        $order_by = 'sort asc,id asc';
         $data = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>$nav_type, 'is_show'=>1, 'pid'=>0))->order($order_by)->select());
         if(!empty($data))
         {
@@ -212,14 +212,15 @@ class NavigationService
         $where1[] = ['pid', '=', 0];
 
         $field = '*';
-        $data = self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where1)->order('sort')->select()));
+        $order_by = 'sort asc,id asc';
+        $data = self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where1)->order($order_by)->select()));
         $result = [];
         if(!empty($data))
         {
             // 子级数据组合
             $where2 = $where;
             $where2[] = ['pid', 'in', array_column($data, 'id')];
-            $items_data = self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where2)->order('sort')->select()));
+            $items_data = self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where2)->order($order_by)->select()));
             $items_group = [];
             if(!empty($items_data))
             {

application/service/SlideService.php

@@ -37,7 +37,7 @@ class SlideService
         $field = empty($params['field']) ? '*' : $params['field'];
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
-        $order_by = 'sort asc,id desc';
+        $order_by = 'sort asc,id asc';
         $data = Db::name('Slide')->field($field)->where($where)->order($order_by)->limit($m, $n)->select();
         if(!empty($data))
         {

sourcecode/alipay/app.js

@@ -67,7 +67,7 @@ App({
 
     // 请求地址
     request_url: "{{request_url}}",
-    // request_url: 'http://shopxo.com/',
+     request_url: 'http://shopxo.com/',
     // request_url: 'http://dev.shopxo.net/',
 
     // 基础信息
@@ -75,7 +75,8 @@ App({
     application_describe: "{{application_describe}}",
 
     // 价格符号
-    price_symbol: "{{price_symbol}}"
+    price_symbol: "{{price_symbol}}",
+    price_symbol: "￥",
   },
 
   /**

sourcecode/alipay/app.json

@@ -66,7 +66,7 @@
     "pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail"
   ],
   "window": {
-    "defaultTitle": "{{application_title}}",
+    "defaultTitle": "shopxo",
     "titleBarColor": "#d2364c",
     "backgroundColor": "#f5f5f5"
   },

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

@@ -340,8 +340,8 @@
 }
 
 /*
- * 展示型
+ * 示型、商品独立类型 操作按钮100%宽度
  */
-.goods-buy-nav .exhibition-mode button {
+.goods-buy-nav .buy-nav-submit-full button {
   width: 100%;
 }
\ No newline at end of file

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

@@ -30,7 +30,7 @@
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
   <!-- 限时秒杀 -->
-  <view a:if="{{common_app_is_limitedtimediscount == 1 && plugins_limitedtimediscount_data != null}}">
+  <view a:if="{{plugins_limitedtimediscount_is_valid == 1}}">
     <import src="/pages/lib/limitedtimediscount/goods-detail.axml" />
     <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
   </view>
@@ -137,7 +137,7 @@
       <image src="{{goods_favor_icon}}" mode="scaleToFill" />
       <text class="dis-block cr-888">{{goods_favor_text}}</text>
     </view>
-    <view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
+    <view class="fr {{(common_site_type == 1 || ((is_goods_site_type_consistent || 0) != 1 && common_site_type != 1)) ? 'buy-nav-submit-full' : ''}}">
       <!-- 展示型 -->
       <block a:if="{{common_site_type == 1}}">
         <button class="bg-main fl" type="default" onTap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
@@ -145,7 +145,7 @@
 
       <!-- 销售型,自提点,虚拟销售 -->
       <block a:else>
-        <button class="bg-warning fl" type="default" onTap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
+        <button a:if="{{(is_goods_site_type_consistent || 0) == 1}}" class="bg-warning fl" type="default" onTap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
         <button class="bg-main fl" type="default" onTap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>
       </block>
     </view>

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

@@ -45,7 +45,7 @@ Page({
     common_app_mini_alipay_openid: null,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_is_show_time: true,
     plugins_limitedtimediscount_time_millisecond: 0,
@@ -60,6 +60,7 @@ Page({
 
     // 站点类型
     common_site_type: 0,
+    is_goods_site_type_consistent: 0,
     customer_service_tel: null,
 
     // 优惠劵领取
@@ -135,8 +136,9 @@ Page({
               common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
               common_is_goods_detail_show_photo: data.common_is_goods_detail_show_photo || 0,
 
-              common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+              plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
+
               plugins_coupon_data: data.plugins_coupon_data || null,
               quick_nav_cart_count: data.common_cart_total || 0,
 
@@ -153,7 +155,7 @@ Page({
             }
 
             // 限时秒杀倒计时
-            if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+            if (this.data.plugins_limitedtimediscount_is_valid == 1) {
               this.plugins_limitedtimediscount_countdown();
             }
 
@@ -199,6 +201,7 @@ Page({
               nav_submit_text: nav_submit_text,
               nav_submit_is_disabled: nav_submit_is_disabled,
               common_site_type: common_site_type,
+              is_goods_site_type_consistent: data.is_goods_site_type_consistent || 0,
               customer_service_tel: data.customer_service_tel || null,
             });
           } else {

sourcecode/alipay/pages/index/index.axml

@@ -19,7 +19,7 @@
 <component-icon-nav data="{{navigation}}" />
 
 <!-- 限时秒杀 -->
-<view a:if="{{common_app_is_limitedtimediscount == 1}}">
+<view a:if="{{plugins_limitedtimediscount_is_valid == 1}}">
   <import src="/pages/lib/limitedtimediscount/home.axml" />
   <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}"></template>
 </view>

sourcecode/alipay/pages/index/index.js

@@ -20,7 +20,7 @@ Page({
     common_app_mini_alipay_openid: null,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount : 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_timer_title: '距离结束',
     plugins_limitedtimediscount_is_show_time: true,
@@ -64,8 +64,8 @@ Page({
             common_app_is_enable_answer: data.common_app_is_enable_answer,
             common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
             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,
+            plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
 
             // 在线客服
             common_app_is_online_service: data.common_app_is_online_service || 0,
@@ -89,7 +89,7 @@ Page({
           }
 
           // 限时秒杀倒计时
-          if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null)
+          if (this.data.plugins_limitedtimediscount_is_valid == 1)
           {
             this.plugins_limitedtimediscount_countdown();
           }

sourcecode/alipay/pages/user-integral/user-integral.axml

@@ -3,7 +3,7 @@
     <view class="data-card bg-white br-b" a:for="{{data_list}}">
       <view class="data-box oh">
       <import src="/pages/common/nodata.axml" />
-        <text class="data-title">{{item.type_text}}</text>
+        <text class="data-title">{{item.type_text}} {{item.new_integral}}</text>
         <text class="data-time fr">{{item.add_time_time}}</text>
       </view>
       <view class="data-value">

sourcecode/baidu/app.js

@@ -67,7 +67,7 @@ App({
 
     // 请求地址
     request_url: "{{request_url}}",
-    // request_url: 'http://shopxo.com/',
+     request_url: 'http://shopxo.com/',
     // request_url: 'https://dev.shopxo.net/',
 
     // 基础信息
@@ -75,7 +75,8 @@ App({
     application_describe: "{{application_describe}}",
 
     // 价格符号
-    price_symbol: "{{price_symbol}}"
+    price_symbol: "{{price_symbol}}",
+    price_symbol: "￥",
   },
 
   /**

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

@@ -345,8 +345,8 @@
 }
 
 /*
- * 展示型
+ * 展示型、商品独立类型 操作按钮100%宽度
  */
-.goods-buy-nav .exhibition-mode button {
+.goods-buy-nav .buy-nav-submit-full button {
   width: 100%;
 }
\ No newline at end of file

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

@@ -40,7 +40,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_is_show_time: true,
     plugins_limitedtimediscount_time_millisecond: 0,
@@ -55,6 +55,7 @@ Page({
 
     // 站点类型
     common_site_type: 0,
+    is_goods_site_type_consistent: 0,
     customer_service_tel: null,
 
     // 优惠劵领取
@@ -130,14 +131,16 @@ Page({
               common_is_goods_detail_show_photo: data.common_is_goods_detail_show_photo || 0,
               common_app_is_online_service: data.common_app_is_online_service || 0,
 
-              common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+              plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
+
               plugins_coupon_data: data.plugins_coupon_data || null,
               quick_nav_cart_count: data.common_cart_total || 0,
             });
 
             // 限时秒杀倒计时
-            if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+            if (this.data.plugins_limitedtimediscount_is_valid == 1)
+            {
               this.plugins_limitedtimediscount_countdown();
             }
 
@@ -171,6 +174,7 @@ Page({
               nav_submit_text: nav_submit_text,
               nav_submit_is_disabled: nav_submit_is_disabled,
               common_site_type: common_site_type,
+              is_goods_site_type_consistent: data.is_goods_site_type_consistent || 0,
               customer_service_tel: data.customer_service_tel || null,
             });
 

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

@@ -24,7 +24,7 @@
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
   <!-- 限时秒杀 -->
-  <view s-if="common_app_is_limitedtimediscount == 1 && plugins_limitedtimediscount_data != null">
+  <view s-if="plugins_limitedtimediscount_is_valid == 1">
     <import src="/pages/lib/limitedtimediscount/goods-detail.swan" />
     <template is="limitedtimediscount" data="{{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}}"></template>
   </view>
@@ -130,7 +130,7 @@
       <image src="{{goods_favor_icon}}" mode="scaleToFill" />
       <text class="dis-block cr-888">{{goods_favor_text}}</text>
     </view>
-    <view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
+    <view class="fr {{(common_site_type == 1 || ((is_goods_site_type_consistent || 0) != 1 && common_site_type != 1)) ? 'buy-nav-submit-full' : ''}}">
       <!-- 展示型 -->
       <block s-if="common_site_type == 1">
         <button class="bg-main fl" type="default" bindtap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
@@ -138,7 +138,7 @@
 
       <!-- 销售型,自提点,虚拟销售 -->
       <block s-else>
-        <button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
+        <button s-if="(is_goods_site_type_consistent || 0) == 1" class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
         <button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>
       </block>
     </view>

sourcecode/baidu/pages/index/index.js

@@ -15,7 +15,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_timer_title: '距离结束',
     plugins_limitedtimediscount_is_show_time: true,
@@ -58,8 +58,8 @@ Page({
             common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
             data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
             common_app_is_online_service: data.common_app_is_online_service || 0,
-            common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
-            plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null
+            plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+            plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
           });
 
           // 导航购物车处理
@@ -72,7 +72,7 @@ Page({
           }
 
           // 限时秒杀倒计时
-          if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+          if (this.data.plugins_limitedtimediscount_is_valid == 1) {
             this.plugins_limitedtimediscount_countdown();
           }
 

sourcecode/baidu/pages/index/index.swan

@@ -19,7 +19,7 @@
 <component-icon-nav navigation="{{navigation}}"></component-icon-nav>
 
 <!-- 限时秒杀 -->
-<view s-if="common_app_is_limitedtimediscount == 1">
+<view s-if="plugins_limitedtimediscount_is_valid == 1">
   <import src="/pages/lib/limitedtimediscount/home.swan" />
   <template is="limitedtimediscount" data="{{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}}"></template>
 </view>

sourcecode/baidu/pages/user-integral/user-integral.swan

@@ -3,7 +3,7 @@
     <view class="data-card bg-white br-b" s-for="item, index in data_list">
       <view class="data-box oh">
       <import src="/pages/common/nodata.swan" />
-        <text class="data-title">{{item.type_text}}</text>
+        <text class="data-title">{{item.type_text}} {{item.new_integral}}</text>
         <text class="data-time fr">{{item.add_time_time}}</text>
       </view>
       <view class="data-value">

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

@@ -40,7 +40,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_is_show_time: true,
     plugins_limitedtimediscount_time_millisecond: 0,
@@ -70,6 +70,7 @@ Page({
 
     // 站点模式
     common_site_type: 0,
+    is_goods_site_type_consistent: 0,
     customer_service_tel: null,
 
     // 优惠劵领取
@@ -150,8 +151,8 @@ Page({
               common_is_goods_detail_show_photo: data.common_is_goods_detail_show_photo || 0,
               //common_app_is_online_service: data.common_app_is_online_service || 0,
 
-              common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+              plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
 
               common_app_is_good_thing: data.common_app_is_good_thing || 0,
               'share_product.item_code': data.goods.id.toString(),
@@ -168,7 +169,7 @@ Page({
             });
 
             // 限时秒杀倒计时
-            if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+            if (this.data.plugins_limitedtimediscount_is_valid == 1) {
               this.plugins_limitedtimediscount_countdown();
             }
 
@@ -202,6 +203,7 @@ Page({
               nav_submit_text: nav_submit_text,
               nav_submit_is_disabled: nav_submit_is_disabled,
               common_site_type: common_site_type,
+              is_goods_site_type_consistent: data.is_goods_site_type_consistent || 0,
               customer_service_tel: data.customer_service_tel || null,
             });
           } else {

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

@@ -30,7 +30,7 @@
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
   <!-- 限时秒杀 -->
-  <view qq:if="{{common_app_is_limitedtimediscount == 1 && plugins_limitedtimediscount_data != null}}">
+  <view qq:if="{{plugins_limitedtimediscount_is_valid == 1}}">
     <import src="/pages/lib/limitedtimediscount/goods-detail.qml" />
     <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
   </view>
@@ -137,7 +137,7 @@
       <image src="{{goods_favor_icon}}" mode="scaleToFill" />
       <text class="dis-block cr-888">{{goods_favor_text}}</text>
     </view>
-    <view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
+    <view class="fr {{(common_site_type == 1 || ((is_goods_site_type_consistent || 0) != 1 && common_site_type != 1)) ? 'buy-nav-submit-full' : ''}}">
       <!-- 站点模式 1 展示型 -->
       <block qq:if="{{common_site_type == 1}}">
         <button class="bg-main fl" type="default" bindtap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
@@ -145,7 +145,7 @@
 
       <!-- 销售型,自提点,虚拟销售 -->
       <block qq:else>
-        <button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
+        <button qq:if="{{(is_goods_site_type_consistent || 0) == 1}}" class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
         <button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>
       </block>
     </view>

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

@@ -341,8 +341,8 @@
 }
 
 /*
- * 展示型
+ * 展示型、商品独立类型 操作按钮100%宽度
  */
-.goods-buy-nav .exhibition-mode button {
+.goods-buy-nav .buy-nav-submit-full button {
   width: 100%;
 }
\ No newline at end of file

sourcecode/qq/pages/index/index.js

@@ -15,7 +15,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount : 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_timer_title: '距离结束',
     plugins_limitedtimediscount_is_show_time: true,
@@ -57,8 +57,8 @@ Page({
             common_app_is_enable_answer: data.common_app_is_enable_answer,
             common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
             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,
+            plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
           });
 
           // 导航购物车处理
@@ -71,7 +71,7 @@ Page({
           }
 
           // 限时秒杀倒计时
-          if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null)
+          if (this.data.plugins_limitedtimediscount_is_valid == 1)
           {
             this.plugins_limitedtimediscount_countdown();
           }

sourcecode/qq/pages/index/index.qml

@@ -19,7 +19,7 @@
 <component-icon-nav prop-data="{{navigation}}"></component-icon-nav>
 
 <!-- 限时秒杀 -->
-<view qq:if="{{common_app_is_limitedtimediscount == 1}}">
+<view qq:if="{{plugins_limitedtimediscount_is_valid == 1}}">
   <import src="/pages/lib/limitedtimediscount/home.qml" />
   <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}"></template>
 </view>

sourcecode/qq/pages/user-integral/user-integral.qml

@@ -3,7 +3,7 @@
     <view class="data-card bg-white br-b" qq:for="{{data_list}}">
       <view class="data-box oh">
       <import src="/pages/common/nodata.qml" />
-        <text class="data-title">{{item.type_text}}</text>
+        <text class="data-title">{{item.type_text}} {{item.new_integral}}</text>
         <text class="data-time fr">{{item.add_time_time}}</text>
       </view>
       <view class="data-value">

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

@@ -40,7 +40,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_is_show_time: true,
     plugins_limitedtimediscount_time_millisecond: 0,
@@ -70,6 +70,7 @@ Page({
 
     // 站点模式
     common_site_type: 0,
+    is_goods_site_type_consistent: 0,
     customer_service_tel: null,
 
     // 优惠劵领取
@@ -150,8 +151,8 @@ Page({
               common_is_goods_detail_show_photo: data.common_is_goods_detail_show_photo || 0,
               common_app_is_online_service: data.common_app_is_online_service || 0,
 
-              common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+              plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
 
               common_app_is_good_thing: data.common_app_is_good_thing || 0,
               'share_product.item_code': data.goods.id.toString(),
@@ -168,7 +169,7 @@ Page({
             });
 
             // 限时秒杀倒计时
-            if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+            if (this.data.plugins_limitedtimediscount_is_valid == 1) {
               this.plugins_limitedtimediscount_countdown();
             }
 
@@ -202,6 +203,7 @@ Page({
               nav_submit_text: nav_submit_text,
               nav_submit_is_disabled: nav_submit_is_disabled,
               common_site_type: common_site_type,
+              is_goods_site_type_consistent: data.is_goods_site_type_consistent || 0,
               customer_service_tel: data.customer_service_tel || null,
             });
           } else {

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

@@ -30,7 +30,7 @@
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
   <!-- 限时秒杀 -->
-  <view tt:if="{{common_app_is_limitedtimediscount == 1 && plugins_limitedtimediscount_data != null}}">
+  <view tt:if="{{plugins_limitedtimediscount_is_valid == 1}}">
     <import src="/pages/lib/limitedtimediscount/goods-detail.ttml" />
     <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
   </view>
@@ -137,7 +137,7 @@
       <image src="{{goods_favor_icon}}" mode="scaleToFill" />
       <text class="dis-block cr-888">{{goods_favor_text}}</text>
     </view>
-    <view class="fr {{common_site_type == 1 ? 'exhibition-mode' : ''}}">
+    <view class="fr {{(common_site_type == 1 || ((is_goods_site_type_consistent || 0) != 1 && common_site_type != 1)) ? 'buy-nav-submit-full' : ''}}">
       <!-- 站点模式 1 展示型 -->
       <block tt:if="{{common_site_type == 1}}">
         <button class="bg-main fl" type="default" bindtap="exhibition_submit_event" hover-class="none">{{nav_submit_text}}</button>
@@ -145,7 +145,7 @@
 
       <!-- 销售型,自提点,虚拟销售 -->
       <block tt:else>
-        <button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
+        <button tt:if="{{(is_goods_site_type_consistent || 0) == 1}}" class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
         <button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>
       </block>
     </view>

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

@@ -341,8 +341,8 @@
 }
 
 /*
- * 展示型
+ * 展示型、商品独立类型 操作按钮100%宽度
  */
-.goods-buy-nav .exhibition-mode button {
+.goods-buy-nav .buy-nav-submit-full button {
   width: 100%;
 }
\ No newline at end of file

sourcecode/toutiao/pages/index/index.js

@@ -15,7 +15,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
-    common_app_is_limitedtimediscount : 0,
+    plugins_limitedtimediscount_is_valid : 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_timer_title: '距离结束',
     plugins_limitedtimediscount_is_show_time: true,
@@ -58,8 +58,8 @@ Page({
             common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
             data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
             common_app_is_online_service: data.common_app_is_online_service || 0,
-            common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
             plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+            plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
           });
 
           // 导航购物车处理
@@ -72,7 +72,7 @@ Page({
           }
 
           // 限时秒杀倒计时
-          if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null)
+          if (this.data.plugins_limitedtimediscount_is_valid == 1)
           {
             this.plugins_limitedtimediscount_countdown();
           }

sourcecode/toutiao/pages/index/index.ttml

@@ -22,7 +22,7 @@
 <component-icon-nav prop-data="{{navigation}}"></component-icon-nav>
 
 <!-- 限时秒杀 -->
-<view tt:if="{{common_app_is_limitedtimediscount == 1}}">
+<view tt:if="{{plugins_limitedtimediscount_is_valid == 1}}">
   <import src="/pages/lib/limitedtimediscount/home.ttml" />
   <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}"></template>
 </view>

sourcecode/toutiao/pages/user-integral/user-integral.ttml

@@ -3,7 +3,7 @@
     <view class="data-card bg-white br-b" tt:for="{{data_list}}">
       <view class="data-box oh">
       <import src="/pages/common/nodata.ttml" />
-        <text class="data-title">{{item.type_text}}</text>
+        <text class="data-title">{{item.type_text}} {{item.new_integral}}</text>
         <text class="data-time fr">{{item.add_time_time}}</text>
       </view>
       <view class="data-value">

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

@@ -41,6 +41,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_is_show_time: true,
     plugins_limitedtimediscount_time_millisecond: 0,
@@ -70,6 +71,7 @@ Page({
 
     // 站点模式
     common_site_type: 0,
+    is_goods_site_type_consistent: 0,
     customer_service_tel: null,
 
     // 优惠劵领取
@@ -151,6 +153,7 @@ Page({
               common_app_is_online_service: data.common_app_is_online_service || 0,
 
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+              plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
 
               common_app_is_good_thing: data.common_app_is_good_thing || 0,
               'share_product.item_code': data.goods.id.toString(),
@@ -167,7 +170,8 @@ Page({
             });
 
             // 限时秒杀倒计时
-            if (this.data.plugins_limitedtimediscount_data != null && (this.data.plugins_limitedtimediscount_data.is_valid || 0) == 1) {
+            if (this.data.plugins_limitedtimediscount_is_valid == 1)
+            {
               this.plugins_limitedtimediscount_countdown();
             }
 

sourcecode/weixin/pages/goods-detail/goods-detail.wxml

@@ -30,7 +30,7 @@
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
   <!-- 限时秒杀 -->
-  <view wx:if="{{plugins_limitedtimediscount_data != null && (plugins_limitedtimediscount_data.is_valid || 0) == 1}}">
+  <view wx:if="{{plugins_limitedtimediscount_is_valid == 1}}">
     <import src="/pages/lib/limitedtimediscount/goods-detail.wxml" />
     <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
   </view>

sourcecode/weixin/pages/index/index.js

@@ -15,6 +15,7 @@ Page({
     common_app_is_online_service: 0,
 
     // 限时秒杀插件
+    plugins_limitedtimediscount_is_valid: 0,
     plugins_limitedtimediscount_data: null,
     plugins_limitedtimediscount_timer_title: '距离结束',
     plugins_limitedtimediscount_is_show_time: true,
@@ -58,6 +59,7 @@ Page({
             data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
             common_app_is_online_service: data.common_app_is_online_service || 0,
             plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
+            plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
           });
 
           // 导航购物车处理
@@ -70,7 +72,7 @@ Page({
           }
 
           // 限时秒杀倒计时
-          if (this.data.plugins_limitedtimediscount_data != null && (this.data.plugins_limitedtimediscount_data.is_valid || 0) == 1)
+          if (this.data.plugins_limitedtimediscount_is_valid == 1)
           {
             this.plugins_limitedtimediscount_countdown();
           }

sourcecode/weixin/pages/index/index.wxml

@@ -19,7 +19,7 @@
 <component-icon-nav prop-data="{{navigation}}"></component-icon-nav>
 
 <!-- 限时秒杀 -->
-<view wx:if="{{plugins_limitedtimediscount_data != null && (plugins_limitedtimediscount_data.is_valid || 0) == 1}}">
+<view wx:if="{{plugins_limitedtimediscount_is_valid == 1}}">
   <import src="/pages/lib/limitedtimediscount/home.wxml" />
   <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}"></template>
 </view>

sourcecode/weixin/pages/user-integral/user-integral.wxml

@@ -3,7 +3,7 @@
     <view class="data-card bg-white br-b" wx:for="{{data_list}}">
       <view class="data-box oh">
       <import src="/pages/common/nodata.wxml" />
-        <text class="data-title">{{item.type_text}}</text>
+        <text class="data-title">{{item.type_text}} {{item.new_integral}}</text>
         <text class="data-time fr">{{item.add_time_time}}</text>
       </view>
       <view class="data-value">