Commit 69e7d5151ba42b4d45592b28301abe7b3dd3baa3
1 parent
6ec9400c
oa 单
Showing
4 changed files
with
9 additions
and
15 deletions
packageD/pages/AI-test-skin/success_result/success_result.js
| 1 | 1 | /* |
| 2 | 2 | * @Author: abson |
| 3 | 3 | * @Date: 2022-02-16 15:36:47 |
| 4 | - * @LastEditTime: 2022-02-28 16:01:07 | |
| 4 | + * @LastEditTime: 2022-03-10 11:16:23 | |
| 5 | 5 | * @LastEditors: Please set LastEditors |
| 6 | 6 | * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE |
| 7 | 7 | * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js |
| ... | ... | @@ -63,14 +63,7 @@ Page({ |
| 63 | 63 | }, |
| 64 | 64 | |
| 65 | 65 | onReady: function () { |
| 66 | - //用异步的获取比较准一点 | |
| 67 | - wx.getSystemInfo({ | |
| 68 | - success(res) { | |
| 69 | - console.log(111); | |
| 70 | - console.log(res.windowWidth); | |
| 71 | - console.log(res.windowHeight); | |
| 72 | - } | |
| 73 | - }) | |
| 66 | + | |
| 74 | 67 | }, |
| 75 | 68 | |
| 76 | 69 | /** |
| ... | ... | @@ -155,7 +148,6 @@ Page({ |
| 155 | 148 | var eye_data1 = face_data1.landmark150.eye_left_corner_right; |
| 156 | 149 | var eye_data2 = face_data1.landmark150.eye_left_corner_left; |
| 157 | 150 | var eye_data3 = face_data1.landmark150.eye_right_corner_right; |
| 158 | - | |
| 159 | 151 | var hei1 = Math.abs(eye_data1.x - eye_data2.x); |
| 160 | 152 | var bili_eye = th.data.face_height * 0.56 / hei1; |
| 161 | 153 | var eye_top = eye_data1.y - hei1 / 2 | ... | ... |
pages/cart/cart2/cart2.js
| ... | ... | @@ -2257,8 +2257,6 @@ Page({ |
| 2257 | 2257 | var order_prom_txt1 = "formData.order_prom_id"; |
| 2258 | 2258 | var order_prom_txt2 = "formData.order_prom_amount"; |
| 2259 | 2259 | th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) |
| 2260 | - | |
| 2261 | - | |
| 2262 | 2260 | total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); |
| 2263 | 2261 | order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); |
| 2264 | 2262 | var atxt = "formData.total_amount"; | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -274,8 +274,9 @@ |
| 274 | 274 | </view> |
| 275 | 275 | </view> |
| 276 | 276 | <view class="goods-title"> |
| 277 | - <view class="goods-name elli">{{data.goods_name}}</view> | |
| 278 | - </view> | |
| 277 | + <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image> | |
| 278 | + <view class="goods-name elli">{{data.goods_name}}</view> | |
| 279 | + </view> | |
| 279 | 280 | <view class="goods-num"> |
| 280 | 281 | <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view> |
| 281 | 282 | <view class="stock"> |
| ... | ... | @@ -391,6 +392,7 @@ |
| 391 | 392 | <!-- 许程商品名字 --> |
| 392 | 393 | <view wx:if="{{prom_type!=1 && prom_type!=2 }}"> |
| 393 | 394 | <view class="goods-title"> |
| 395 | + <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image> | |
| 394 | 396 | <view class="goods-name elli">{{data.goods_name}}</view> |
| 395 | 397 | </view> |
| 396 | 398 | </view> | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxss
| ... | ... | @@ -126,7 +126,9 @@ image { |
| 126 | 126 | |
| 127 | 127 | .goods-title { |
| 128 | 128 | display: flex; |
| 129 | - justify-content: space-between; | |
| 129 | + justify-content: space-between; | |
| 130 | + align-items: center; | |
| 131 | + vertical-align: middle; | |
| 130 | 132 | /* overflow: hidden; */ |
| 131 | 133 | /* height: 108rpx; */ |
| 132 | 134 | } | ... | ... |