diff --git a/application/admin/controller/Appminibaiduconfig.php b/application/admin/controller/Appminibaiduconfig.php
new file mode 100755
index 0000000000000000000000000000000000000000..2cd7135b09b925e45c3ec02913632004fd613ba8
--- /dev/null
+++ b/application/admin/controller/Appminibaiduconfig.php
@@ -0,0 +1,70 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\admin\controller;
+
+use app\service\ConfigService;
+
+/**
+ * 百度小程序 - 配置
+ * @author   Devil
+ * @blog     http://gong.gg/
+ * @version  0.0.1
+ * @datetime 2016-12-01T21:51:08+0800
+ */
+class AppMiniBaiduConfig extends Common
+{
+	/**
+	 * 构造方法
+	 * @author   Devil
+	 * @blog     http://gong.gg/
+	 * @version  0.0.1
+	 * @datetime 2016-12-03T12:39:08+0800
+	 */
+	public function __construct()
+	{
+		// 调用父类前置方法
+		parent::__construct();
+
+		// 登录校验
+		$this->IsLogin();
+
+		// 权限校验
+		$this->IsPower();
+	}
+
+	/**
+     * [Index 配置列表]
+     * @author   Devil
+     * @blog     http://gong.gg/
+     * @version  0.0.1
+     * @datetime 2016-12-06T21:31:53+0800
+     */
+	public function Index()
+	{
+		// 配置信息
+		$this->assign('data', ConfigService::ConfigList());
+		
+		return $this->fetch();
+	}
+
+	/**
+	 * [Save 配置数据保存]
+	 * @author   Devil
+	 * @blog     http://gong.gg/
+	 * @version  0.0.1
+	 * @datetime 2017-01-02T23:08:19+0800
+	 */
+	public function Save()
+	{
+		return ConfigService::ConfigSave($_POST);
+	}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/controller/Appminibaidulist.php b/application/admin/controller/Appminibaidulist.php
new file mode 100755
index 0000000000000000000000000000000000000000..29d55ee46c8a92f359c34eb89ba0c707ef1d7697
--- /dev/null
+++ b/application/admin/controller/Appminibaidulist.php
@@ -0,0 +1,113 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\admin\controller;
+
+use app\service\AppMiniService;
+
+/**
+ * 百度小程序管理
+ * @author   Devil
+ * @blog     http://gong.gg/
+ * @version  0.0.1
+ * @datetime 2016-12-01T21:51:08+0800
+ */
+class AppMiniBaiduList extends Common
+{
+	private $application_name;
+	private $old_path;
+	private $new_path;
+	private $params;
+
+	/**
+	 * 构造方法
+	 * @author   Devil
+	 * @blog     http://gong.gg/
+	 * @version  0.0.1
+	 * @datetime 2016-12-03T12:39:08+0800
+	 */
+	public function __construct()
+	{
+		// 调用父类前置方法
+		parent::__construct();
+
+		// 登录校验
+		$this->IsLogin();
+
+		// 权限校验
+		$this->IsPower();
+
+		// 参数
+		$this->params = input();
+		$this->params['application_name'] = 'baidu';
+	}
+
+	/**
+     * [Index 列表]
+     * @author   Devil
+     * @blog     http://gong.gg/
+     * @version  0.0.1
+     * @datetime 2016-12-06T21:31:53+0800
+     */
+	public function Index()
+	{
+		$this->assign('data_list', AppMiniService::DataList($this->params));
+		return $this->fetch();
+	}
+
+	/**
+	 * [Created 生成]
+	 * @author   Devil
+	 * @blog     http://gong.gg/
+	 * @version  0.0.1
+	 * @datetime 2017-02-05T20:12:30+0800
+	 */
+	public function Created()
+	{
+		// 是否ajax请求
+		if(!IS_AJAX)
+		{
+			$this->error('非法访问');
+		}
+
+		// 配置内容
+        $app_mini_title = MyC('common_app_mini_baidu_title');
+        $app_mini_describe = MyC('common_app_mini_baidu_describe');
+        if(empty($app_mini_title) || empty($app_mini_describe))
+        {
+            return DataReturn('配置信息不能为空', -1);
+        }
+
+		// 开始操作
+		$this->params['app_mini_title'] = $app_mini_title;
+		$this->params['app_mini_describe'] = $app_mini_describe;
+		return AppMiniService::Created($this->params);
+	}
+
+	/**
+	 * [Delete 删除包]
+	 * @author   Devil
+	 * @blog     http://gong.gg/
+	 * @version  0.0.1
+	 * @datetime 2016-12-09T21:13:47+0800
+	 */
+	public function Delete()
+	{
+		// 是否ajax请求
+		if(!IS_AJAX)
+		{
+			$this->error('非法访问');
+		}
+
+		// 开始操作
+		return AppMiniService::Delete($this->params);
+	}
+}
+?>
\ No newline at end of file
diff --git a/application/admin/view/default/appminibaiduconfig/index.html b/application/admin/view/default/appminibaiduconfig/index.html
new file mode 100755
index 0000000000000000000000000000000000000000..818f697744045842f83fca537242f35083281a3a
--- /dev/null
+++ b/application/admin/view/default/appminibaiduconfig/index.html
@@ -0,0 +1,40 @@
+{{include file="public/header" /}}
+
+<!-- right content start  -->
+<div class="content-right">
+	<div class="content">
+		<!-- form start -->
+		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/appminibaiduconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appminibaiduconfig/index')}}">
+			<div class="am-form-group">
+				<label>{{$data.common_app_mini_baidu_appid.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_baidu_appid.describe}}</span></label>
+				<input type="text" name="{{$data.common_app_mini_baidu_appid.only_tag}}" placeholder="{{$data.common_app_mini_baidu_appid.name}}" data-validation-message="{{$data.common_app_mini_baidu_appid.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_baidu_appid.value}}"{{/if}} />
+			</div>
+			<div class="am-form-group">
+				<label>{{$data.common_app_mini_baidu_appkey.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_baidu_appkey.describe}}</span></label>
+				<input type="text" name="{{$data.common_app_mini_baidu_appkey.only_tag}}" placeholder="{{$data.common_app_mini_baidu_appkey.name}}" data-validation-message="{{$data.common_app_mini_baidu_appkey.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_baidu_appkey.value}}"{{/if}} />
+			</div>
+			<div class="am-form-group">
+				<label>{{$data.common_app_mini_baidu_appsecret.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_baidu_appsecret.describe}}</span></label>
+				<input type="text" name="{{$data.common_app_mini_baidu_appsecret.only_tag}}" placeholder="{{$data.common_app_mini_baidu_appsecret.name}}" data-validation-message="{{$data.common_app_mini_baidu_appsecret.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_baidu_appsecret.value}}"{{/if}} />
+			</div>
+
+			<div class="am-form-group">
+				<label>{{$data.common_app_mini_baidu_title.name}}</label>
+				<input type="text" name="{{$data.common_app_mini_baidu_title.only_tag}}" placeholder="{{$data.common_app_mini_baidu_title.name}}" data-validation-message="{{$data.common_app_mini_baidu_title.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_baidu_title.value}}"{{/if}} />
+			</div>
+			<div class="am-form-group">
+				<label>{{$data.common_app_mini_baidu_describe.name}}</label>
+				<input type="text" name="{{$data.common_app_mini_baidu_describe.only_tag}}" placeholder="{{$data.common_app_mini_baidu_describe.name}}" data-validation-message="{{$data.common_app_mini_baidu_describe.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_baidu_describe.value}}"{{/if}} />
+			</div>
+			<div class="am-form-group am-form-group-refreshing">
+				<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/appminibaidulist/index.html b/application/admin/view/default/appminibaidulist/index.html
new file mode 100755
index 0000000000000000000000000000000000000000..eb18efa4ef71aebb3a2f91175c1ee34a9d9e8e04
--- /dev/null
+++ b/application/admin/view/default/appminibaidulist/index.html
@@ -0,0 +1,67 @@
+{{include file="public/header" /}}
+
+<!-- right content start  -->
+<div class="content-right">
+	<div class="content">
+		<!-- operation start -->
+        <div class="am-g">
+            <button class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-ajax" data-url="{{:MyUrl('admin/appminibaidulist/created')}}" data-view="reload" data-msg="生成时间比较长，请不要关闭浏览器窗口！"> 生成</button>
+        </div>
+        <!-- operation end -->
+
+		<!-- miniapp develop tips -->
+        {{if config('shopxo.is_develop') eq true}}
+	        <div class="am-alert am-alert-warning am-radius" data-am-alert="">
+			    当前为开发模式<br />
+			    &nbsp;&nbsp;&nbsp;1. 发布小程序必须采用 https 协议，上线需确认 app.js 中 request_url 参数值是否正确。<br />
+			    &nbsp;&nbsp;&nbsp;2. 发布小程序，建议关闭开发者模式、从正式环境重新生成小程序下载使用开发者工具上传审核。<br />
+			    &nbsp;&nbsp;&nbsp;3. 非 https 环境下，在开发者工具 -> 顶部导航 -> 校验域名（关闭即可）。
+			</div>
+		{{else /}}
+			<div class="am-alert am-alert-warning am-radius" data-am-alert="">
+			    1. 生成小程序必须在 https 协议下进行操作、请配置好服务器 ssl 并使用 https 协议登录后台管理生成小程序。<br />
+			    2. 如需非 https 协议下生成小程序，请在 config/shopxo.php 文件中 is_develop值改为true开启开发者模式。
+			</div>
+		{{/if}}
+
+		<!-- list start -->
+		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+			<thead>
+				<tr>
+					<th>包名</th>
+					<th>大小</th>
+					<th>创建时间</th>
+					<th>操作</th>
+				</tr>
+			</thead>
+			<tbody>
+				{{if !empty($data_list)}}
+					{{foreach $data_list as $v}}
+						<tr>
+							<td>{{$v.name}}</td>
+							<td>{{$v.size}}</td>
+							<td>{{$v.time}}</td>
+							<td class="view-operation">
+								{{if !empty($v.url)}}
+									<a href="{{$v.url}}">
+										<button class="am-btn am-btn-success am-btn-xs am-radius am-icon-download"> 下载</button>
+									</a>
+								{{/if}}
+								<button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/appminibaidulist/delete')}}" data-id="{{$v.name}}" data-view="reload"> 删除</button>
+							</td>
+						</tr>
+					{{/foreach}}
+				{{/if}}
+			</tbody>
+		</table>
+		{{if empty($data_list)}}
+            <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+        {{/if}}
+		<!-- lis end -->
+	</div>
+</div>
+<!-- right content end  -->
+
+<!-- footer start -->
+{{include file="public/footer" /}}
+<!-- footer end -->
\ No newline at end of file
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 6f7450578d7dce09dd12bb28dd0f0f6bdb47038f..e969f054b581f3b0d38dd08759849c11d147ce8e 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -227,19 +227,12 @@ class User extends Common
      */
     public function BaiduUserAuth()
     {
-        //return DataReturn('暂未开放', -1);
-
-        //$_POST['config'] = MyC('baidu_mini_program_config');
-        $_POST['config'] = [
-            'id'        => '16634987',
-            'key'       => 'C9Gg744cBqQ3zvbC5uOPMg9yWpmuQ8O7',
-            'secret'    => 'KmdPEyuSAXcbiouKVq6LOSUjctZpxmNb',
-
-            // 'id'        => '14675874',
-            // 'key'       => 'G8x7Q2oSIo2Egcps7QB8fQGCQrUDjwNN',
-            // 'secret'    => 'T5PXvGwDxci6GVAeQErigGvTRK48MVRz',
+        $params['config'] = [
+            'id'        => MyC('common_app_mini_baidu_appid'),
+            'key'       => MyC('common_app_mini_baidu_appkey'),
+            'secret'    => MyC('common_app_mini_baidu_appsecret'),
         ];
-        $result = (new \base\BaiduAuth())->GetAuthUserInfo($_POST);
+        $result = (new \base\BaiduAuth())->GetAuthUserInfo($params);
         if($result['status'] == 0)
         {
             return UserService::AuthUserProgram($result['data'], 'baidu_openid');
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 44c27ac75bbd7818df1cceea3ce824ea0bfb033c..1ec38aad3342e07ed521954ed2f24568c7627e43 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -723,7 +723,7 @@ Page({
         if(count > 9) {
           count = 0;
         }
-        if(self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) {
+        if(self.data.plugins_limitedtimediscount_is_show_time == false) {
           clearInterval(timers);
         }
       }, 100);
diff --git a/public/appmini/old/alipay/pages/goods-search/goods-search.acss b/public/appmini/old/alipay/pages/goods-search/goods-search.acss
old mode 100755
new mode 100644
index 4c015867745d12f7a53de5e37d5dbbabc1badd48..b3191864c40cf8360083c28585b58cbfce1920d5
--- a/public/appmini/old/alipay/pages/goods-search/goods-search.acss
+++ b/public/appmini/old/alipay/pages/goods-search/goods-search.acss
@@ -63,21 +63,21 @@
   padding: 20rpx 20rpx 0 20rpx;
 }
 .popup-form input {
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  font-size: 26rpx;
+  height: 60rpx;
+  line-height: 60rpx;
   background: #fbfbfb;
   border-radius: 6rpx;
 }
 .screening-price input {
-  width: 220rpx;
+  width: calc(50% - 45rpx);
 }
 .screening-price .separator {
   margin-top: 20rpx;
   width: 30rpx;
 }
 .popup-form .keywords input {
-  width: 490rpx;
+  width: calc(100% - 30rpx);
 }
 .popup-form .item:not(:last-child) {
   margin-bottom: 50rpx;
diff --git a/public/appmini/old/baidu/README.md b/public/appmini/old/baidu/README.md
deleted file mode 100755
index d9feb615c22bbae423bca6a712408041e1620c77..0000000000000000000000000000000000000000
--- a/public/appmini/old/baidu/README.md
+++ /dev/null
@@ -1 +0,0 @@
-百度小程序
\ 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 fd561f4ce8ca3b8b591756b79e535a079df5b334..cb0d193cc1e39fc9f433bcfb377256705d071717 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
@@ -249,10 +249,15 @@
   top: calc(65vh - 110rpx);
   z-index: 2;
 }
-.goods-video-submit image {
+.goods-video-submit image, .cover-goods-video-close {
   width: 80rpx;
   height: 80rpx;
 }
+.cover-goods-video-close {
+  position: absolute;
+  left: 30rpx;
+  bottom: 30rpx;
+}
 
 
 /*
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
index 03da24cd91dcae6a2c463e2b5e4355bc37093be3..5fd847c7c3c0caeafecc0dae8f10e0c16becb4d5 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
@@ -627,7 +627,7 @@ Page({
         if (count > 9) {
           count = 0;
         }
-        if (self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) {
+        if(self.data.plugins_limitedtimediscount_is_show_time == false) {
           clearInterval(timers);
         }
       }, 100);
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 319cdf44b7da901bf6a44481ead51957f755e8af..81d73b5a903db3b56bdd5449229f48aa6e29eeab 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
@@ -11,11 +11,12 @@
   <!-- 视频 -->
   <block s-if="goods.video.length > 0">
     <view s-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>
+      <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}}">
+        <cover-image s-if="goods_video_is_autoplay" class="cover-goods-video-close" bindtap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></cover-image>
+      </video>
     </view>
     <view class="goods-video-submit">
       <image s-if="!goods_video_is_autoplay" class="goods-video-play" bindtap="goods_video_play_event" src="/images/goods-detail-video-play.png" mode="aspectFit"></image>
-      <image s-if="goods_video_is_autoplay" class="goods-video-close" bindtap="goods_video_close_event" src="/images/goods-detail-video-close.png" mode="aspectFit"></image>
     </view>
   </block>
 
diff --git a/public/appmini/old/baidu/pages/goods-search/goods-search.css b/public/appmini/old/baidu/pages/goods-search/goods-search.css
index 76de1c8fe6655fa28c67086386e4d16aaa553a3f..2a148770976c97c7047c9a32df92960a65fe39e0 100755
--- a/public/appmini/old/baidu/pages/goods-search/goods-search.css
+++ b/public/appmini/old/baidu/pages/goods-search/goods-search.css
@@ -65,15 +65,15 @@
   height: 100vh;
 }
 .popup-form input {
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  font-size: 26rpx;
+  height: 60rpx;
+  line-height: 60rpx;
   background: #fbfbfb;
   border-radius: 6rpx;
   padding: 0 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 32rpx);
+  width: calc(50% - 16rpx);
 }
 .screening-price .separator {
   margin-top: 10rpx;
diff --git a/public/appmini/old/baidu/pages/index/index.css b/public/appmini/old/baidu/pages/index/index.css
index a7c4a140890271daf13e81638ec47099d0a4801c..1a41da378263a5f6b9a39c0f5d21f44900c1177e 100755
--- a/public/appmini/old/baidu/pages/index/index.css
+++ b/public/appmini/old/baidu/pages/index/index.css
@@ -165,7 +165,7 @@
 }
 .limitedtimediscount .goods-list .item {
   width: 460rpx;
-  height: 605rpx;
+  height: 610rpx;
   border: 1px solid #f5f5f5;
   background: white;
   display: inline-block;
diff --git a/public/appmini/old/baidu/pages/index/index.js b/public/appmini/old/baidu/pages/index/index.js
index 21c4e00c2231c7aacb19cd8ef6177b6dd7ae9962..f6a12e6795a512e21b04614525095e5d8b980ea6 100755
--- a/public/appmini/old/baidu/pages/index/index.js
+++ b/public/appmini/old/baidu/pages/index/index.js
@@ -20,9 +20,19 @@ Page({
   },
 
   onShow() {
+    this.set_page_info();
     this.init();
   },
 
+  // web页面信息设置
+  set_page_info() {
+    swan.setPageInfo({
+      title: app.data.application_title,
+      keywords: app.data.application_describe,
+      description: app.data.application_describe,
+    });
+  },
+
   // 获取数据列表
   init() {
     var self = this;
diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.css b/public/appmini/old/baidu/pages/user-address-save/user-address-save.css
index ad75aa724a055055a6e3a591d2c10079bdec24ae..47dee54700dd04746afccd637df88882462d5f1d 100755
--- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.css
+++ b/public/appmini/old/baidu/pages/user-address-save/user-address-save.css
@@ -17,6 +17,9 @@
     box-sizing: border-box;
     width: calc(100% - 250rpx);
 }
+.submit-bottom {
+    border-radius: 0 !important;
+}
 /* 三级联动 */
 .select-address{
     box-sizing: border-box;
diff --git a/public/appmini/old/baidu/pages/user-address/user-address.css b/public/appmini/old/baidu/pages/user-address/user-address.css
index dff6f15ed71e0e69a6d51cc0ebf3dbb15de42ed7..52ef9c6445a4e4f8ea9363efc3c223dfcd60d602 100755
--- a/public/appmini/old/baidu/pages/user-address/user-address.css
+++ b/public/appmini/old/baidu/pages/user-address/user-address.css
@@ -24,6 +24,9 @@
 .operation .delete-submit {
     margin-left: 20rpx;
 }
+.submit-bottom {
+    border-radius: 0 !important;
+}
 .page {
     padding-bottom: 85rpx;
 }
\ No newline at end of file
diff --git a/public/appmini/old/baidu/project.swan.json b/public/appmini/old/baidu/project.swan.json
index a050bf44b9efc0a6b62b487b70f4603f64497627..1befe0361c3cf21a29abe92424a55f79068528a1 100644
--- a/public/appmini/old/baidu/project.swan.json
+++ b/public/appmini/old/baidu/project.swan.json
@@ -1 +1 @@
-{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","expands":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib/online-service","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge"],"paths":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.json","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.css","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user/user.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.swan"]},"host":"baiduboxapp","preview":{"packageId":221505},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}}
\ No newline at end of file
+{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"","expands":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib/online-service","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user-address-save","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user-address","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail"],"paths":[]},"host":"baiduboxapp","preview":{"packageId":222699},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}}
\ No newline at end of file
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 a83ef3025cc2fe4f4808ed6b3054fa8ac2f5da07..537e2dc97ce56620ae93d2317bbed9b9f95eef87 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -710,7 +710,7 @@ Page({
         if(count > 9) {
           count = 0;
         }
-        if(self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) {
+        if (self.data.plugins_limitedtimediscount_is_show_time == false) {
           clearInterval(timers);
         }
       }, 100);
diff --git a/public/appmini/old/weixin/pages/goods-search/goods-search.wxss b/public/appmini/old/weixin/pages/goods-search/goods-search.wxss
index 76de1c8fe6655fa28c67086386e4d16aaa553a3f..2a148770976c97c7047c9a32df92960a65fe39e0 100755
--- a/public/appmini/old/weixin/pages/goods-search/goods-search.wxss
+++ b/public/appmini/old/weixin/pages/goods-search/goods-search.wxss
@@ -65,15 +65,15 @@
   height: 100vh;
 }
 .popup-form input {
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  font-size: 26rpx;
+  height: 60rpx;
+  line-height: 60rpx;
   background: #fbfbfb;
   border-radius: 6rpx;
   padding: 0 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 32rpx);
+  width: calc(50% - 16rpx);
 }
 .screening-price .separator {
   margin-top: 10rpx;