From 3d4f84dce4e582a85965118414e474df8c246cde Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Wed, 24 May 2023 11:20:55 +0800
Subject: [PATCH] 测肤修改

---
 packageD/pages/AI-test-skin/analyse/analyse.js                 |  5 +++++
 packageD/pages/AI-test-skin/history_record/history_record.js   |  3 +++
 packageD/pages/AI-test-skin/history_record/history_record.wxml |  7 ++++++-
 packageD/pages/AI-test-skin/select_photo/select_photo.js       | 25 ++++++++++++++++++++++---
 packageD/pages/AI-test-skin/select_photo/select_photo.wxml     |  5 +++++
 packageD/pages/AI-test-skin/select_photo/select_photo.wxss     | 10 ++++++++++
 6 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/packageD/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js
index 52775d1..fd10228 100644
--- a/packageD/pages/AI-test-skin/analyse/analyse.js
+++ b/packageD/pages/AI-test-skin/analyse/analyse.js
@@ -26,6 +26,7 @@ Page({
         err_map: null,
         skin_type: 0,
         ce_user_id:0,
+        img_remark:''
     },
 
     /**
@@ -36,6 +37,7 @@ Page({
             var plugin = requirePlugin('mtSkinSdk')
             plugin.setConfig(pluginGD)
         }
+        this.setData({img_remark:options.img_remark})
 
         if(options.ce_user_id)
             this.data.ce_user_id=options.ce_user_id;
@@ -519,6 +521,7 @@ Page({
                     resultjson: JSON.stringify(analyse_data),
                     detectjson: JSON.stringify(analyse_info),
                     skin_type: 1,
+                    img_remark:th.data.img_remark
                 }
                 //要保存一下分析的结果
                 th.json_post("/api/weshop/face/storeSkinface/save", req_data, function (res) {
@@ -556,6 +559,8 @@ Page({
                     resultjson: JSON.stringify(res.data.data),
                     detectjson: JSON.stringify(th.data.check_data),
                     skin_type: 0,
+                    img_remark:th.data.img_remark
+
                 }
 
                 var txt=[];
diff --git a/packageD/pages/AI-test-skin/history_record/history_record.js b/packageD/pages/AI-test-skin/history_record/history_record.js
index 640e4cb..fb2abf6 100644
--- a/packageD/pages/AI-test-skin/history_record/history_record.js
+++ b/packageD/pages/AI-test-skin/history_record/history_record.js
@@ -203,6 +203,7 @@ Page({
         for (let i = 0; i < data.length; i++) {
             let history = data[i];
             let id = history.id;
+            let img_remark = history.img_remark;
             let now = new Date(history['addtime'] * 1000);
             let year = now.getFullYear(); //年
             let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
@@ -218,10 +219,12 @@ Page({
             let obj = {
                 time,
                 id,
+                img_remark,
             };
             if (arr.length > 0) {
                 let index = arr.findIndex(item => {
                     return item['history_time'] === history_time;
+                    
                 })
                 if (index > -1) {
                     arr[index]['time_arr'].push(obj);
diff --git a/packageD/pages/AI-test-skin/history_record/history_record.wxml b/packageD/pages/AI-test-skin/history_record/history_record.wxml
index 4fd17de..2410a79 100644
--- a/packageD/pages/AI-test-skin/history_record/history_record.wxml
+++ b/packageD/pages/AI-test-skin/history_record/history_record.wxml
@@ -14,9 +14,14 @@
     <view class="history_list">
         <view class="history_list_month" wx:for="{{history}}">
             <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.history_time}}</view>
-            <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
+            <view  wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
+
+              <view class="pdt16 fs28" wx:if="{{subitem.img_remark}}">{{subitem.img_remark}}</view>
+              <view class="souce">
                 <view style="font-weight: 600;">{{subitem.time}}</view>
                 <view style="color: #9b9b9b;" >去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
+              </view>
+            
             </view>
         </view>
     </view>
diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.js b/packageD/pages/AI-test-skin/select_photo/select_photo.js
index f727d19..ab9dc5e 100644
--- a/packageD/pages/AI-test-skin/select_photo/select_photo.js
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.js
@@ -13,7 +13,8 @@ Page({
         iurl: setting.imghost,
         gl_skin_img: null,
         skin_type: 0,
-        ce_user_id:0
+        ce_user_id:0,
+        img_remark:''
     },
 
     /**
@@ -40,9 +41,13 @@ Page({
                     if (e.data.code == 0) {
                         getApp().globalData.face_img = e.data.data.img;
                         getApp().globalData.face_SourceImg = e.data.data.SourceImg;
-                        let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
+                        var getimg_remark=th.data.img_remark;
+
+                       
+                        let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页                      
+                          url+="?img_remark="+getimg_remark;                      
                         if(th.data.ce_user_id)
-                            url+="?ce_user_id="+th.data.ce_user_id;
+                            url+="&ce_user_id="+th.data.ce_user_id;
 
                         console.log("select_ph");
                         console.log(url);
@@ -60,6 +65,20 @@ Page({
         })
 
     },
+
+    getInput(e) {
+      let val = e.detail.value;
+      if (val) {
+          this.setData({
+             img_remark: e.detail.value,
+          });
+      } else {
+          this.setData({
+            img_remark: '',
+          });
+      }
+
+  },
     //-- 重新从相册中选择图片 --
     show_pai_pop: function () {
         var th = this;
diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.wxml b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
index 3c33116..1207659 100644
--- a/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
@@ -3,6 +3,11 @@
         <image style="width: 100%;border-radius: 3%;" mode="widthFix" src="{{gl_skin_img['path']}}"></image>
         <!-- <image wx:else style="width: 100%;border-radius: 3%;" mode="widthFix" src="{{gl_skin_img['path']}}"></image> -->
     </view>
+ 
+      <view>
+       <input class="inputclass" name="img_remark" value="" placeholder="请填写备注" bindinput="getInput"> </input>
+        </view>
+    
     <view class="foot_btn">
         <view class="reset_select" bindtap="takePhoto">
             <text class="iconfont icon-zuojiantou" style="font-size: 40rpx"></text>
diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.wxss b/packageD/pages/AI-test-skin/select_photo/select_photo.wxss
index 3bb701c..e12925c 100644
--- a/packageD/pages/AI-test-skin/select_photo/select_photo.wxss
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxss
@@ -28,3 +28,13 @@ page {
     /* margin: 0 auto; */
     color: #fff;
 }
+
+.inputclass{
+  width: 540rpx;
+  height: 55rpx;
+  line-height: 55rpx;
+  background-color: rgb(238, 238, 238);
+  border-radius: 6rpx;
+  padding-left: 40rpx;
+  padding-right: 15rpx;
+}
\ No newline at end of file
--
libgit2 0.21.4