Commit b07dc2bd0e54cf93c5dcc43d3a07ad91e4fd8a59

Authored by zhiyangdu
1 parent 3a626679

积分商城和原生联调

src/pages/goodDetails/goodDetails.vue
... ... @@ -48,7 +48,7 @@
48 48 积分+现金
49 49 </div>
50 50 <div>
51   - <span v-if="goodsInfo && goodsInfo.prices" class="price">¥{{goodsInfo.prices}}</span>
  51 + <span v-if="goodsInfo && goodsInfo.price" class="price">¥{{goodsInfo.price}}</span>
52 52 <span v-if="goodsInfo && goodsInfo.num" class="integral">{{goodsInfo.num}}</span>
53 53 <span class="integral-in">积分</span>
54 54 </div>
... ... @@ -132,7 +132,7 @@
132 132 <!-- 地址信息组件 -->
133 133 <!-- <app-address-toast ref="itemsInfo" @toUpdate="toLinkPointsMall" v-show="pointsToast_control"></app-address-toast> -->
134 134 <!-- 底部弹出层 -->
135   - <van-popup class="popup_box" v-model="show" position="bottom">
  135 + <van-popup class="popup_box" v-model="show" position="bottom" :close-on-click-overlay="false">
136 136 <div class="popup_main">
137 137 <!-- 商品信息 -->
138 138 <div class="goods_box">
... ... @@ -142,12 +142,13 @@
142 142 <div class="right">
143 143 <!-- 标题 -->
144 144 <div class="title">
145   - <div class="title_t">山东沂蒙 优质大蒜山东</div>
  145 + <div v-if="goodsInfo && goodsInfo.title" class="title_t">{{goodsInfo.title}}</div>
146 146 <img @click="show=false" class="close" src="static/img/close_grey.png" alt="" />
147 147 </div>
148 148 <!-- 价格 -->
149 149 <div class="pirce">
150   - 500积分+9.9元
  150 + <span v-if="goodsInfo && goodsInfo.num">{{goodsInfo.num}}积分+</span>
  151 + <span v-if="goodsInfo && goodsInfo.price">{{goodsInfo.price}}元</span>
151 152 </div>
152 153 </div>
153 154 </div>
... ... @@ -155,7 +156,7 @@
155 156 <div class="num_box">
156 157 <div class="num_tip">购买数量</div>
157 158 <div class="right">
158   - <van-stepper theme="round" input-width="40px" input-size="32px" button-size="32px" v-model="stepperValue" min="1" max="8" integer />
  159 + <van-stepper theme="round" input-width="40px" input-size="32px" button-size="32px" v-model="stepperValue" min="1" :max="(goodsInfo && goodsInfo.stock > -1) ?goodsInfo.stock :'999'" integer />
159 160 <!-- <img src="static/img/reduce.png" alt="" />
160 161 <div class="num">1</div>
161 162 <img src="static/img/plus.png" alt="" /> -->
... ... @@ -167,7 +168,7 @@
167 168 <div class="right">积分加现金</div>
168 169 </div>
169 170 <!-- 按钮 -->
170   - <div @click="jumpToConfirmOrderPage" class="btn">确定</div>
  171 + <div @click="jumpToConfirmOrderPage(goodsInfo)" class="btn">确定</div>
171 172 </div>
172 173 </van-popup>
173 174 </div>
... ... @@ -191,7 +192,7 @@ export default {
191 192 // pointsToast_control: false,
192 193 isExchange: false, // 是否已经兑换
193 194 show: false, // 是否显示底部支付模块
194   - stepperValue: 2 // 进步器
  195 + stepperValue: 1 // 进步器
195 196 }
196 197 },
197 198 //部件
... ... @@ -233,15 +234,16 @@ export default {
233 234 },
234 235 // 跳转到确认订单详情
235 236 jumpToConfirmOrderPage (item) {
  237 + console.log(item);
236 238 // 判断APP内
237 239 if (this.isCNLive.value) {
238 240 // (判断app内是否有该方法)type=2为积分加现金模式
239 241 if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.jumpToConfirmOrderPage) {
240 242 // 跳转到原生的任务列表
241   - window.webkit.messageHandlers.jumpToConfirmOrderPage.postMessage({ body: { pointsOrderId: item.id, goodSid: item.goodsid, num: stepperValue, type:4} })
  243 + window.webkit.messageHandlers.jumpToConfirmOrderPage.postMessage({ body: { pointsOrderId: item.id, goodSid: item.goodsid, num: this.stepperValue, type:4} })
242 244 } else if (window.obj && window.obj.jumpToConfirmOrderPage) {
243 245 // 跳转到原生的任务列表
244   - window.obj.jumpToConfirmOrderPage(JSON.stringify({ pointsOrderId: item.id, goodSid: item.goodsid, num: stepperValue, type:4 }));
  246 + window.obj.jumpToConfirmOrderPage(JSON.stringify({ pointsOrderId: item.id, goodSid: item.goodsid, num: this.stepperValue, type:4 }));
245 247 }
246 248 }
247 249 },
... ... @@ -506,6 +508,7 @@ export default {
506 508 let { data: datas } = res;
507 509 /* 获取详细信息 */
508 510 this.goodsInfo = datas
  511 + /* 设置商品详情页 */
509 512 /* 相似商品 */
510 513 } else if (res.code == 400) {
511 514  
... ...