oa 单

abson
1 parent 6ec9400c
Showing 4 changed files with 9 additions and 15 deletions
packageD/pages/AI-test-skin/success_result/success_result.js
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
 /*
  * @Author: abson
  * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-28 16:01:07
+ * @LastEditTime: 2022-03-10 11:16:23
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
@@ -63,14 +63,7 @@ Page({
     },
     onReady: function () {
-        //用异步的获取比较准一点
-        wx.getSystemInfo({
-            success(res) {
-                console.log(111);
-                console.log(res.windowWidth);
-                console.log(res.windowHeight);
-            }
-        })
+        
     },
     /**
@@ -155,7 +148,6 @@ Page({
                     var eye_data1 = face_data1.landmark150.eye_left_corner_right;
                     var eye_data2 = face_data1.landmark150.eye_left_corner_left;
                     var eye_data3 = face_data1.landmark150.eye_right_corner_right;
-
                     var hei1 = Math.abs(eye_data1.x - eye_data2.x);
                     var bili_eye = th.data.face_height * 0.56 / hei1;
                     var eye_top = eye_data1.y - hei1 / 2
@@ -2257,8 +2257,6 @@ Page({
                     var order_prom_txt1 = "formData.order_prom_id";
                     var order_prom_txt2 = "formData.order_prom_amount";
                     th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
-
-
                     total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
                     order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
                     var atxt = "formData.total_amount";
@@ -274,8 +274,9 @@
               </view>
             </view>
             <view class="goods-title">
-              <view class="goods-name elli">{{data.goods_name}}</view>
-            </view>
+                <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>
+                <view class="goods-name elli">{{data.goods_name}}</view>
+              </view>
             <view class="goods-num">
               <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
               <view class="stock">
@@ -391,6 +392,7 @@
             <!-- 许程商品名字 -->
             <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
               <view class="goods-title">
+                <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>
                 <view class="goods-name elli">{{data.goods_name}}</view>
               </view>
             </view>
@@ -126,7 +126,9 @@ image {
 .goods-title {
 	display: flex;
-	justify-content: space-between;
+    justify-content: space-between;
+    align-items: center;
+    vertical-align: middle;
 	/* overflow: hidden; */
 	/* height: 108rpx; */
 }