Merge branch 'raccount' of 39.97.239.116:gyfl/xyzshop into raccount

data/config/win/refill.ini.php

@@ -2456,12 +2456,12 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.31, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.025, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.27, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [

data/config/xyz/refill.ini.php

@@ -2456,12 +2456,12 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.31, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.025, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.27, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [

data/config/xyzadm/refill.ini.php

@@ -2456,12 +2456,12 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.31, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.025, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.27, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [

mobile/templates/default/shop/goods.php

@@ -701,10 +701,10 @@ $(function(){
             $(this).show();
         }
     });
-    $("#salelog_demo").load('index.php?act=goods&op=salelog&goods_id=<?php echo $output['goods']['goods_id'];?>&store_id=<?php echo $output['goods']['store_id'];?>&vr=<?php echo $output['goods']['is_virtual'];?>', function(){
-        // Membership card
-        $(this).find('[nctype="mcard"]').membershipCard({type:'shop'});
-    });
+    //$("#salelog_demo").load('index.php?act=goods&op=salelog&goods_id=<?php //echo $output['goods']['goods_id'];?>//&store_id=<?php //echo $output['goods']['store_id'];?>//&vr=<?php //echo $output['goods']['is_virtual'];?>//', function(){
+    //    // Membership card
+    //    $(this).find('[nctype="mcard"]').membershipCard({type:'shop'});
+    //});
 	$("#consulting_demo").load('index.php?act=goods&op=consulting&goods_id=<?php echo $output['goods']['goods_id'];?>&store_id=<?php echo $output['goods']['store_id'];?>', function(){
 		// Membership card
 		$(this).find('[nctype="mcard"]').membershipCard({type:'shop'});

shop/templates/default/store/goods.php

@@ -405,18 +405,18 @@
           <div id="goodseval" class="ncs-commend-main"></div>
         </div>
       </div>
-      <div class="ncg-salelog">
-        <div class="ncs-goods-title-bar hd">
-          <h4><a href="javascript:void(0);"><?php echo $lang['goods_index_sold_record'];?></a></h4>
-        </div>
-        <div class="ncs-goods-info-content bd" id="ncGoodsTraded">
-          <div class="top">
-            <div class="price"><?php echo $lang['goods_index_goods_price'];?><strong><?php echo $output['goods']['goods_price'];?></strong><?php echo $lang['goods_index_yuan'];?><span><?php echo $lang['goods_index_price_note'];?></span></div>
-          </div>
-          <!-- 成交记录内容部分 -->
-          <div id="salelog_demo" class="ncs-loading"> </div>
-        </div>
-      </div>
+<!--      <div class="ncg-salelog">-->
+<!--        <div class="ncs-goods-title-bar hd">-->
+<!--          <h4><a href="javascript:void(0);">--><?php //echo $lang['goods_index_sold_record'];?><!--</a></h4>-->
+<!--        </div>-->
+<!--        <div class="ncs-goods-info-content bd" id="ncGoodsTraded">-->
+<!--          <div class="top">-->
+<!--            <div class="price">--><?php //echo $lang['goods_index_goods_price'];?><!--<strong>--><?php //echo $output['goods']['goods_price'];?><!--</strong>--><?php //echo $lang['goods_index_yuan'];?><!--<span>--><?php //echo $lang['goods_index_price_note'];?><!--</span></div>-->
+<!--          </div>-->
+<!--           成交记录内容部分 -->
+<!--          <div id="salelog_demo" class="ncs-loading"> </div>-->
+<!--        </div>-->
+<!--      </div>-->
       <div class="ncs-consult">
         <div class="ncs-goods-title-bar hd">
           <h4><a href="javascript:void(0);"><?php echo $lang['goods_index_goods_consult'];?></a></h4>
@@ -701,10 +701,10 @@ $(function(){
             $(this).show();
         }
     });
-    $("#salelog_demo").load('index.php?act=goods&op=salelog&goods_id=<?php echo $output['goods']['goods_id'];?>&store_id=<?php echo $output['goods']['store_id'];?>&vr=<?php echo $output['goods']['is_virtual'];?>', function(){
-        // Membership card
-        $(this).find('[nctype="mcard"]').membershipCard({type:'shop'});
-    });
+    //$("#salelog_demo").load('index.php?act=goods&op=salelog&goods_id=<?php //echo $output['goods']['goods_id'];?>//&store_id=<?php //echo $output['goods']['store_id'];?>//&vr=<?php //echo $output['goods']['is_virtual'];?>//', function(){
+    //    // Membership card
+    //    $(this).find('[nctype="mcard"]').membershipCard({type:'shop'});
+    //});
 	$("#consulting_demo").load('index.php?act=goods&op=consulting&goods_id=<?php echo $output['goods']['goods_id'];?>&store_id=<?php echo $output['goods']['store_id'];?>', function(){
 		// Membership card
 		$(this).find('[nctype="mcard"]').membershipCard({type:'shop'});