From ae78fd5d857d593070017578089ed017708daf11 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 6 Mar 2023 17:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA,=E4=BB=B7=E6=A0=BC=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              | 2 +-
 pages/info/postProductInfo/index.js | 8 ++++----
 pages/list/activitynew/index.wxml   | 4 ++--
 pages/list/techan/index.wxml        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 1933352..14672bf 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest58? true : false;
+      data.isTest = data.isTest59? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 6fd1215..2f1ce66 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -46,9 +46,7 @@ Page({
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
     this.setData({
       top: height,
-      id: options.id,
-      iShop:options.iShop||false,
-      supplierId:options.supplierId
+      id: options.id
     })
     // 获取购物车按钮的位置
     wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
@@ -73,7 +71,9 @@ Page({
       }
       res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
       this.setData({
-        info: res.data
+        info: res.data,
+        supplierId:res.data.supplier_id,
+        iShop:res.data.supplier_id?true:false
       })
 
       // 获取补贴
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 9d75834..7fc61dd 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -35,10 +35,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
     </view> -->
-    <!-- <view class="type-item" bindtap="changeType" data-type="4">
+    <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view> -->
+    </view>
     <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 7a992ad..9d8e3df 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -19,13 +19,13 @@
         </view>
         <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text>{{item.address}}</view>
       </view>
-      <view class="supplier-price"><text>￥</text><text>{{tool.toFix(item.start_price)}}</text><text>起</text></view>
+      <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
     </view>
     <view class="product-list">
       <view data-item="{{item}}" class="product-item" wx:for="{{item.product}}">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="product-title textOver2">{{item.title}}</view>
-        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{tool.toFix(item.price)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
+        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
       </view>
     </view>
   </view>