海涛 8 years ago
parent
commit
8f77bca4f2

+ 1 - 1
www/protected/modules/o2o/controllers/OrderController.php

@@ -31,7 +31,7 @@ class  OrderController extends O2oBaseController{
             //}
             //}
         }
         }
         //双十一活动暂用  start 判断用户是否购买过  58227d2ba84ea0c17e8b45b2
         //双十一活动暂用  start 判断用户是否购买过  58227d2ba84ea0c17e8b45b2
-        $doubleEleventId = '582487169f5160d0048b4fe7';
+        $doubleEleventId = '581fe5a6a84ea0e36c8b45bb';
         $flag_book = 0;
         $flag_book = 0;
         if($products[0]['product_id'] == $doubleEleventId) {
         if($products[0]['product_id'] == $doubleEleventId) {
             $criteria_user = new EMongoCriteria();
             $criteria_user = new EMongoCriteria();

+ 1 - 1
www/webapp/o2o/js/model/product.js

@@ -1136,7 +1136,7 @@ define(['base', '$', 'api'], function (base, $, api) {
             },
             },
             {
             {
                 id: "582487169f5160d0048b4fe7",
                 id: "582487169f5160d0048b4fe7",
-                name: "双11虹口区日常保洁特价体验",
+                name: "活动产品",
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
                 status: 1,
                 status: 1,

+ 1 - 1
www/webapp/o2o/js/page/pay.js

@@ -30,7 +30,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     var params = {
                     var params = {
                         orderInfo: orderInfo,
                         orderInfo: orderInfo,
                         charge: res.data,
                         charge: res.data,
-                        isSpecial: res.data.body == "双11虹口区日常保洁特价体验"
+                        isSpecial: res.data.body == "活动产品"
                     };
                     };
                     native.pay(params, function (resA) {
                     native.pay(params, function (resA) {
                         if (resA.success) {
                         if (resA.success) {