Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

pages/detail/good/index.wxml

@@ -76,7 +76,7 @@
   <view class="edit-good btn-com btn-com-b" wx:if="{{editOrShow==1}}" bindtap="editGood">
   <view class="edit-good btn-com btn-com-b" wx:if="{{editOrShow==1}}" bindtap="editGood">
     <text class="gt-t">编辑商品</text>
     <text class="gt-t">编辑商品</text>
   </view>
   </view>
-    <view class="refresh-time btn-com  btn-com-y" wx:if="{{editOrShow==1}}" bindtap="refreshGood">
+    <!-- <view class="refresh-time btn-com  btn-com-y" wx:if="{{editOrShow==1}}" bindtap="refreshGood">
     <text class="gt-t">擦亮商品</text>
     <text class="gt-t">擦亮商品</text>
-  </view>
+  </view> -->
 </view>
 </view>
\ No newline at end of file

pages/form/bj/index.js

@@ -127,7 +127,6 @@ Page({
       type: options.type || "",
       type: options.type || "",
       obj:JSON.parse(options.obj||'{}')
       obj:JSON.parse(options.obj||'{}')
     });
     });
-    console.log(this.data.obj)
     let delivery_time = this.data.obj.delivery_time;
     let delivery_time = this.data.obj.delivery_time;
     if (this.data.obj.currency=='2'){
     if (this.data.obj.currency=='2'){
       this.setData({
       this.setData({

res/css/detail.wxss

@@ -84,7 +84,7 @@
 }
 }
 .edit-good{
 .edit-good{
   position: absolute;
   position: absolute;
-  bottom:230rpx;
+  bottom:94rpx;
   left:0;
   left:0;
   right:0;
   right:0;
 }
 }