小程序优惠劵

application/service/UeditorService.php

@@ -98,7 +98,9 @@ class UeditorService
                 return DataReturn('callback参数不合法', -1);
             }
         }
-        if(isset(self::$current_result['state']) && self::$current_result['state'] != 'SUCCESS')
+
+        // 未成功，非web环境下直接返回错误信息
+        if(!in_array(APPLICATION_CLIENT_TYPE, ['pc', 'h5']) && isset(self::$current_result['state']) && self::$current_result['state'] != 'SUCCESS')
         {
             return DataReturn(self::$current_result['state'], -1);
         }

public/appmini/old/alipay/pages/goods-detail/goods-detail.acss

@@ -232,7 +232,7 @@
 
 
 /*
- * 限时秒杀
+ * 限时秒杀 - 插件
  */
 .limitedtimediscount {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQIAAAAgAQMAAADDkuSaAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExUReQ5POlVO+6K1q8AAACiSURBVDjLhZK7EYMwEETlISCkBJUCnUEplOISXIJDQgcEHg9o/Vt5ZOZu9eKXvL0LIbOECg3OFSMiVYwRWKVwwouLMtq3gUkY/cfYhIEvi2gls9+aEa3kLlqJndwVBga/lSTRSm6i1U2OByNNfivZRCu5Wnf9Z/BbyS5ajfUb0ygfO9pGkTzaBh6i9bB+6xr5sXvf2EUrWUVrsX6UBkTrL/kJzQQAijmza5AAAAAASUVORK5CYII=) right top no-repeat #f23030;

public/appmini/old/alipay/pages/index/index.acss

@@ -104,7 +104,7 @@
 
 
 /*
- * 限时秒杀
+ * 限时秒杀 - 插件
  */
  .limitedtimediscount {
   background: #fff;

public/appmini/old/baidu/pages/goods-detail/goods-detail.css

@@ -261,7 +261,7 @@
 
 
 /*
- * 限时秒杀
+ * 限时秒杀 - 插件
  */
 .limitedtimediscount {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQIAAAAgAQMAAADDkuSaAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExUReQ5POlVO+6K1q8AAACiSURBVDjLhZK7EYMwEETlISCkBJUCnUEplOISXIJDQgcEHg9o/Vt5ZOZu9eKXvL0LIbOECg3OFSMiVYwRWKVwwouLMtq3gUkY/cfYhIEvi2gls9+aEa3kLlqJndwVBga/lSTRSm6i1U2OByNNfivZRCu5Wnf9Z/BbyS5ajfUb0ygfO9pGkTzaBh6i9bB+6xr5sXvf2EUrWUVrsX6UBkTrL/kJzQQAijmza5AAAAAASUVORK5CYII=) right top no-repeat #f23030;

public/appmini/old/baidu/pages/index/index.css

@@ -102,14 +102,9 @@
   font-size: 30rpx;
 }
 
-.limitedtimediscount {
-  background: #fff;
-  padding: 5rpx 10rpx 20rpx 10rpx;
-  margin-bottom: 20rpx;
-}
 
 /*
- * 限时秒杀
+ * 限时秒杀 - 插件
  */
  .limitedtimediscount {
   background: #fff;

public/appmini/old/weixin/app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/coupon/coupon",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -27,8 +26,8 @@
     "pages/user-goods-browse/user-goods-browse",
     "pages/user-orderaftersale/user-orderaftersale",
     "pages/user-orderaftersale-detail/user-orderaftersale-detail",
+    "pages/coupon/coupon",
     "pages/user-coupon/user-coupon"
-    
   ],
   "window": {
     "navigationBarTitleText": "{{application_title}}",

public/appmini/old/weixin/app.wxss

@@ -405,4 +405,76 @@ button[disabled].bg-primary {
   width: 210rpx;
   height: 210rpx;
   border: 1px dashed #e9e9e9;
+}
+
+
+/*
+ * 优惠劵 - 插件
+ */
+.coupon-container {
+  padding: 0 10rpx;
+}
+.coupon-container .item {
+  overflow: hidden;
+  height: 180rpx;
+  border: 1px solid #D2364C;
+}
+.coupon-container .v-left {
+  width: calc(100% - 140rpx);
+  padding: 30rpx 0 30rpx 20rpx;
+  box-sizing:border-box;  
+  -moz-box-sizing:border-box;
+  -webkit-box-sizing:border-box;
+}
+.coupon-container .v-left .base {
+  color: #D2364C;
+}
+.coupon-container .v-left .base .symbol {
+  font-family: Verdana, Tahoma;
+  font-size: 48rpx;
+  font-weight: 400;
+}
+.coupon-container .v-left .base .price {
+  font-weight: 700;
+  font-family: arial;
+  font-size: 76rpx;
+}
+.coupon-container .v-left .base .desc {
+  margin-left: 20rpx;
+}
+.coupon-container .v-left base-tips, .coupon-container .v-left .base-time {
+  margin-top: 10rpx;
+}
+
+.coupon-container .v-right {
+  background: #d2364c;
+  width: 140rpx;
+  height: 180rpx;
+  color: #fff;
+  font-weight: 500;
+  position: relative;
+  text-align: center;
+}
+.coupon-container .v-right:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle;
+}
+.coupon-container .v-right .circle {
+    display: block;
+    position: absolute;
+    left: -1px;
+    top: -3px;
+    width: 3px;
+    height: 180rpx;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAACpCAYAAADur4c3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MjUzYzIwOS04ZWNlLTRlNTctODQ4OC01ZDExOTkwOGNkYmMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTM1QzgxREZGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTM1QzgxREVGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTJiNzVkOGUtZDc2Yi00MzEzLWFmNmYtYTJkNTRlYTI4YTY1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjcyNTNjMjA5LThlY2UtNGU1Ny04NDg4LTVkMTE5OTA4Y2RiYyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pvy+vnQAAAEqSURBVHjaYvz//z8DDDAxIAFyOVeBOAHEYfyPMDsLmXMfmfMT2YADDP8h4CEQq4A4aUDMA1LNSKZDXwJxGcg1yJaWIXOeInO+IxuwA+acK0AsA+IEADEbic7hhPOAer4DcQcQMyNb2oLMeYVsADcyZwPMObuBWBTEsQFpI9E54sjO+QvEc0F+YoHKJgHxJ2TnvEM2gBmZswrmnA1AzAXiaJPhHC1k58BNQ3bBTGTOR2QD/iJzFsH8Mw/kHxBHggzn2KA7BxzWyC5Yisz5imwACmc2LLY7QbEN4nCS4ZwAIGZFds5lUEpEdsF6nKn3PTJnAsiAV0BcBsSM5GamFCDmQXYOOJ8iu2Anzrz9HKU8ABlwDYgTKcnbo0XNaFEzWtQgipqOYVLUAAQYAKPWa4c8cIHnAAAAAElFTkSuQmCC) no-repeat;
+}
+.coupon-container .item-disabled .v-right {
+  background: #dfdfdf !important;
+  color: #c0c0c0 !important;
+  cursor: no-drop !important;
+}
+.coupon-container .item-disabled  {
+  border: 1px solid #dfdfdf !important;
 }

public/appmini/old/weixin/pages/coupon/coupon.wxml

@@ -1,7 +1,7 @@
 <image wx:if="{{(data_base || null) != null && (data_base.banner_images || null) != null}}" class="banner wh-auto dis-block" src="{{data_base.banner_images}}" mode="widthFix" />
 
 <!-- 优惠劵列表 -->
-<view wx:if="{{data_list.length > 0}}" class="data-list">
+<view wx:if="{{data_list.length > 0}}" class="coupon-container">
   <block wx:for="{{data_list}}" wx:key="item">
     <view class="item spacing-mt bg-white {{item.is_operable == 0 ? 'item-disabled' : ''}}" style="border:1px solid {{item.bg_color_value}};">
       <view class="v-left fl">

public/appmini/old/weixin/pages/coupon/coupon.wxss

@@ -1,70 +0,0 @@
-/*
- * 数据列表
- */
-.data-list {
-  padding: 0 10rpx;
-}
-.data-list .item {
-  overflow: hidden;
-  height: 180rpx;
-  border: 1px solid #D2364C;
-}
-.v-left {
-  width: calc(100% - 140rpx);
-  padding: 30rpx 0 30rpx 20rpx;
-  box-sizing:border-box;  
-  -moz-box-sizing:border-box;
-  -webkit-box-sizing:border-box;
-}
-.v-left .base {
-  color: #D2364C;
-}
-.v-left .base .symbol {
-  font-family: Verdana, Tahoma;
-  font-size: 48rpx;
-  font-weight: 400;
-}
-.v-left .base .price {
-  font-weight: 700;
-  font-family: arial;
-  font-size: 76rpx;
-}
-.v-left .base .desc {
-  margin-left: 20rpx;
-}
-.v-left base-tips, .v-left .base-time {
-  margin-top: 10rpx;
-}
-
-.v-right {
-  background: #d2364c;
-  width: 140rpx;
-  height: 180rpx;
-  color: #fff;
-  font-weight: 500;
-  position: relative;
-  text-align: center;
-}
-.v-right:before {
-  content: '';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle;
-}
-.v-right .circle {
-    display: block;
-    position: absolute;
-    left: -1px;
-    top: -3px;
-    width: 3px;
-    height: 180rpx;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAACpCAYAAADur4c3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MjUzYzIwOS04ZWNlLTRlNTctODQ4OC01ZDExOTkwOGNkYmMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTM1QzgxREZGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTM1QzgxREVGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTJiNzVkOGUtZDc2Yi00MzEzLWFmNmYtYTJkNTRlYTI4YTY1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjcyNTNjMjA5LThlY2UtNGU1Ny04NDg4LTVkMTE5OTA4Y2RiYyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pvy+vnQAAAEqSURBVHjaYvz//z8DDDAxIAFyOVeBOAHEYfyPMDsLmXMfmfMT2YADDP8h4CEQq4A4aUDMA1LNSKZDXwJxGcg1yJaWIXOeInO+IxuwA+acK0AsA+IEADEbic7hhPOAer4DcQcQMyNb2oLMeYVsADcyZwPMObuBWBTEsQFpI9E54sjO+QvEc0F+YoHKJgHxJ2TnvEM2gBmZswrmnA1AzAXiaJPhHC1k58BNQ3bBTGTOR2QD/iJzFsH8Mw/kHxBHggzn2KA7BxzWyC5Yisz5imwACmc2LLY7QbEN4nCS4ZwAIGZFds5lUEpEdsF6nKn3PTJnAsiAV0BcBsSM5GamFCDmQXYOOJ8iu2Anzrz9HKU8ABlwDYgTKcnbo0XNaFEzWtQgipqOYVLUAAQYAKPWa4c8cIHnAAAAAElFTkSuQmCC) no-repeat;
-}
-.item-disabled .v-right {
-  background: #dfdfdf !important;
-  color: #c0c0c0 !important;
-  cursor: no-drop !important;
-}
-.item-disabled  {
-  border: 1px solid #dfdfdf !important;
-}

public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss

@@ -256,7 +256,7 @@
 
 
 /*
- * 限时秒杀
+ * 限时秒杀 - 插件
  */
 .limitedtimediscount {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQIAAAAgAQMAAADDkuSaAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExUReQ5POlVO+6K1q8AAACiSURBVDjLhZK7EYMwEETlISCkBJUCnUEplOISXIJDQgcEHg9o/Vt5ZOZu9eKXvL0LIbOECg3OFSMiVYwRWKVwwouLMtq3gUkY/cfYhIEvi2gls9+aEa3kLlqJndwVBga/lSTRSm6i1U2OByNNfivZRCu5Wnf9Z/BbyS5ajfUb0ygfO9pGkTzaBh6i9bB+6xr5sXvf2EUrWUVrsX6UBkTrL/kJzQQAijmza5AAAAAASUVORK5CYII=) right top no-repeat #f23030;

public/appmini/old/weixin/pages/index/index.wxss

@@ -102,14 +102,9 @@
   font-size: 30rpx;
 }
 
-.limitedtimediscount {
-  background: #fff;
-  padding: 5rpx 10rpx 20rpx 10rpx;
-  margin-bottom: 20rpx;
-}
 
 /*
- * 限时秒杀
+ * 限时秒杀 - 插件
  */
  .limitedtimediscount {
   background: #fff;

public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml

@@ -7,7 +7,7 @@
   </view>
 
   <!-- 优惠劵列表 -->
-  <view class="data-list">
+  <view class="coupon-container">
     <!-- 未使用 -->
     <view wx:if="{{(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'}}">
       <block wx:for="{{data_list.not_use}}" wx:key="item">

public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss

@@ -25,71 +25,11 @@
 /*
  * 数据列表
  */
-.data-list {
+.coupon-container {
   margin-top: 100rpx;
-  padding: 0 10rpx;
 }
-.data-list .item {
-  overflow: hidden;
+.coupon-container .item,
+.coupon-container .v-right,
+.coupon-container .v-right .circle {
   height: 230rpx;
-  border: 1px solid #D2364C;
-}
-.v-left {
-  width: calc(100% - 140rpx);
-  padding: 30rpx 0 30rpx 20rpx;
-  box-sizing:border-box;  
-  -moz-box-sizing:border-box;
-  -webkit-box-sizing:border-box;
-}
-.v-left .base {
-  color: #D2364C;
-}
-.v-left .base .symbol {
-  font-family: Verdana, Tahoma;
-  font-size: 48rpx;
-  font-weight: 400;
-}
-.v-left .base .price {
-  font-weight: 700;
-  font-family: arial;
-  font-size: 76rpx;
-}
-.v-left .base .desc {
-  margin-left: 20rpx;
-}
-.v-left base-tips, .v-left .base-time {
-  margin-top: 10rpx;
-}
-
-.v-right {
-  background: #d2364c;
-  width: 140rpx;
-  height: 230rpx;
-  color: #fff;
-  font-weight: 500;
-  position: relative;
-  text-align: center;
-}
-.v-right:before {
-  content: '';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle;
-}
-.v-right .circle {
-    display: block;
-    position: absolute;
-    left: -1px;
-    top: -3px;
-    width: 3px;
-    height: 230rpx;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAACpCAYAAADur4c3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MjUzYzIwOS04ZWNlLTRlNTctODQ4OC01ZDExOTkwOGNkYmMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTM1QzgxREZGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTM1QzgxREVGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTJiNzVkOGUtZDc2Yi00MzEzLWFmNmYtYTJkNTRlYTI4YTY1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjcyNTNjMjA5LThlY2UtNGU1Ny04NDg4LTVkMTE5OTA4Y2RiYyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pvy+vnQAAAEqSURBVHjaYvz//z8DDDAxIAFyOVeBOAHEYfyPMDsLmXMfmfMT2YADDP8h4CEQq4A4aUDMA1LNSKZDXwJxGcg1yJaWIXOeInO+IxuwA+acK0AsA+IEADEbic7hhPOAer4DcQcQMyNb2oLMeYVsADcyZwPMObuBWBTEsQFpI9E54sjO+QvEc0F+YoHKJgHxJ2TnvEM2gBmZswrmnA1AzAXiaJPhHC1k58BNQ3bBTGTOR2QD/iJzFsH8Mw/kHxBHggzn2KA7BxzWyC5Yisz5imwACmc2LLY7QbEN4nCS4ZwAIGZFds5lUEpEdsF6nKn3PTJnAsiAV0BcBsSM5GamFCDmQXYOOJ8iu2Anzrz9HKU8ABlwDYgTKcnbo0XNaFEzWtQgipqOYVLUAAQYAKPWa4c8cIHnAAAAAElFTkSuQmCC) no-repeat;
-}
-.item-disabled .v-right {
-  background: #dfdfdf !important;
-  color: #c0c0c0 !important;
-  cursor: no-drop !important;
-}
-.item-disabled  {
-  border: 1px solid #dfdfdf !important;
 }