Commit a200c4664260eddba5b0d73da65ba1ebe4895610

Authored by 后端研发-苏泰源
2 parents ba549b1c 3a3082d0

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

packageA/pages/goodsInfo/goodsInfo.js
... ... @@ -8,7 +8,6 @@ var t = require("../../../utils/util.js"),
8 8 oo = s.globalData,
9 9 o = s.globalData.setting,
10 10 os = o;
11   -
12 11 let self = null;
13 12  
14 13 //评价加载更多
... ...
packageB/pages/AI-test-skin/index/aiskin.js 0 → 100644
  1 +/*
  2 + * @Author: your name
  3 + * @Date: 2022-02-11 14:13:05
  4 + * @LastEditTime: 2022-02-16 14:18:30
  5 + * @LastEditors: Please set LastEditors
  6 + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  7 + * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\index\aiskin.js
  8 + */
  9 +
  10 +const app = getApp();
  11 +const request = app.request;
  12 +const os = app.globalData;
  13 +const setting = os.setting;
  14 +const ut = require('../../../../utils/util');
  15 +Page({
  16 +
  17 + /**
  18 + * 页面的初始数据
  19 + */
  20 + data: {
  21 + iurl: setting.imghost,
  22 + },
  23 +
  24 + /**
  25 + * 生命周期函数--监听页面加载
  26 + */
  27 + onLoad: function (options) {
  28 +
  29 + },
  30 +
  31 + /**
  32 + * 生命周期函数--监听页面初次渲染完成
  33 + */
  34 + onReady: function () {
  35 +
  36 + },
  37 +
  38 + /**
  39 + * 生命周期函数--监听页面显示
  40 + */
  41 + onShow: function () {
  42 +
  43 + },
  44 +
  45 + /**
  46 + * 生命周期函数--监听页面隐藏
  47 + */
  48 + onHide: function () {
  49 +
  50 + },
  51 +
  52 + goto(e) {
  53 + let url = e.currentTarget.dataset.url;
  54 + app.goto(url);
  55 + },
  56 +
  57 + /**
  58 + * 生命周期函数--监听页面卸载
  59 + */
  60 + onUnload: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * 页面相关事件处理函数--监听用户下拉动作
  66 + */
  67 + onPullDownRefresh: function () {
  68 +
  69 + },
  70 +
  71 + /**
  72 + * 页面上拉触底事件的处理函数
  73 + */
  74 + onReachBottom: function () {
  75 +
  76 + },
  77 +
  78 + /**
  79 + * 用户点击右上角分享
  80 + */
  81 + onShareAppMessage: function () {
  82 +
  83 + }
  84 +})
0 85 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/index/aiskin.json 0 → 100644
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "Ai智能测肤"
  4 +}
0 5 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/index/aiskin.wxml 0 → 100644
  1 +<view class="container1">
  2 + <view class="history">
  3 + <cover-view style="padding: 0 6rpx 0 25rpx;" bindtap="goto" data-url="/packageB/pages/AI-test-skin/history_record/history_record">历史档案</cover-view>
  4 + <text class="iconfont icon-arrow_right"></text>
  5 + </view>
  6 + <image src="{{iurl}}/miniapp/images/skinimg/3.jpeg "></image>
  7 + <view class="start_btn" bindtap="goto" data-url="/packageB/pages/AI-test-skin/shoot_notice/shoot_notice">
  8 + <text>开始测肤</text>
  9 + </view>
  10 +</view>
0 11 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/index/aiskin.wxss 0 → 100644
  1 +/* packageB/pages/AI-test-skin/aiskin.wxss */
  2 +page {
  3 + width: 100%;
  4 + height: 100%;
  5 +}
  6 +image {
  7 + width: 100vw;
  8 + height: 100%;
  9 +}
  10 +.container1 {
  11 + position: relative;
  12 + width: 100%;
  13 + height: 100%;
  14 +}
  15 +.history {
  16 + margin-top: 30rpx;
  17 + display: flex;
  18 + position: absolute;
  19 + right: 0;
  20 + padding: 10rpx;
  21 + border-radius: 50rpx 0 0 50rpx;
  22 + box-shadow: 0 0 2px 2px #f7f5f5;
  23 + color: #4ad5df;
  24 +}
  25 +.start_btn {
  26 + position: fixed;
  27 + bottom: 50rpx;
  28 + /* margin: auto; */
  29 + /* text-align: center; */
  30 + margin-left: 50%;
  31 + transform: translateX(-50%);
  32 + background: #4bd6df;
  33 + padding: 20rpx;
  34 + width: 67%;
  35 + text-align: center;
  36 + border-radius: 40rpx;
  37 + color: #fff;
  38 +}
0 39 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js 0 → 100644
  1 +// packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js
  2 +const app = getApp();
  3 +const request = app.request;
  4 +const os = app.globalData;
  5 +const setting = os.setting;
  6 +const ut = require('../../../../utils/util');
  7 +Page({
  8 +
  9 + /**
  10 + * 页面的初始数据
  11 + */
  12 + data: {
  13 + iurl: setting.imghost,
  14 + },
  15 +
  16 + /**
  17 + * 生命周期函数--监听页面加载
  18 + */
  19 + onLoad: function (options) {
  20 +
  21 + },
  22 +
  23 + /**
  24 + * 生命周期函数--监听页面初次渲染完成
  25 + */
  26 + onReady: function () {
  27 +
  28 + },
  29 +
  30 + /**
  31 + * 生命周期函数--监听页面显示
  32 + */
  33 + onShow: function () {
  34 +
  35 + },
  36 +
  37 + /**
  38 + * 生命周期函数--监听页面隐藏
  39 + */
  40 + onHide: function () {
  41 +
  42 + },
  43 +
  44 + /**
  45 + * 生命周期函数--监听页面卸载
  46 + */
  47 + onUnload: function () {
  48 +
  49 + },
  50 +
  51 + /**
  52 + * 页面相关事件处理函数--监听用户下拉动作
  53 + */
  54 + onPullDownRefresh: function () {
  55 +
  56 + },
  57 +
  58 + /**
  59 + * 页面上拉触底事件的处理函数
  60 + */
  61 + onReachBottom: function () {
  62 +
  63 + },
  64 +
  65 + /**
  66 + * 用户点击右上角分享
  67 + */
  68 + onShareAppMessage: function () {
  69 +
  70 + }
  71 +})
0 72 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.json 0 → 100644
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "拍摄须知"
  4 +}
0 5 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml 0 → 100644
  1 +<!--packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml-->
  2 +<view class="content">
  3 + <view>
  4 + <view class="work">准备工作</view>
  5 + <view class="hengxian"></view>
  6 + </view>
  7 + <view>
  8 + <view class="ready">
  9 + <view class="image">
  10 + <image src="{{iurl}}/miniapp/images/skinimg/4.jpeg"></image>
  11 + <text class="shuxian"></text>
  12 + <image src="{{iurl}}/miniapp/images/skinimg/7.jpeg"></image>
  13 + </view>
  14 + <text class="fs28">1、请对准镜头,闭眼拍照</text>
  15 + </view>
  16 + <view class="ready">
  17 + <view class="image">
  18 + <image src="{{iurl}}/miniapp/images/skinimg/5.jpeg"></image>
  19 + <text class="shuxian"></text>
  20 + <image src="{{iurl}}/miniapp/images/skinimg/7.jpeg"></image>
  21 + </view>
  22 + <text class="fs28">2、请摘下眼镜,撩起刘海</text>
  23 + </view>
  24 + <view class="ready">
  25 + <view class="image">
  26 + <image src="{{iurl}}/miniapp/images/skinimg/8.jpeg"></image>
  27 + <text class="shuxian"></text>
  28 + <image src="{{iurl}}/miniapp/images/skinimg/10.jpeg"></image>
  29 + </view>
  30 + <text class="fs28">3、保持脸部垂直,切勿距离过远过近</text>
  31 + </view>
  32 + </view>
  33 + <view style="margin: 100rpx 0 40rpx 0;">
  34 + <view class="work">注意事项</view>
  35 + <view class="hengxian"></view>
  36 + </view>
  37 + <view>
  38 + <view class="ready">
  39 + <view class="image_1">
  40 + <image src="{{iurl}}/miniapp/images/skinimg/6.jpeg"></image>
  41 + </view>
  42 + <text class="fs28">1、脸部置于画面中央,请勿距离过远或过近</text>
  43 + </view>
  44 + <view class="ready1">
  45 + <view class="image_1">
  46 + <image src="{{iurl}}/miniapp/images/skinimg/9.jpeg"></image>
  47 + </view>
  48 + <text class="fs28">2、脸部保持平视摄像头</text>
  49 + </view>
  50 + </view>
  51 +</view>
  52 +<view style="height: 300rpx;background-color: #e7f5fb;">
  53 + <view class="btn_fixed">
  54 + <view class="btn">
  55 + 准备闭眼拍摄
  56 + </view>
  57 + <view class="notice" style="display:flex;justify-content:center;align-items: center;">
  58 + <text class="iconfont icon-info" style="margin-right: 10rpx;font-size: 26rpx"></text>
  59 + <text>如无闭眼,将导致图片分析失败</text>
  60 + </view>
  61 + </view>
  62 +</view>
0 63 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss 0 → 100644
  1 +/* packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss */
  2 +page {
  3 + width: 100vw;
  4 + height: 100%;
  5 + padding: 40rpx 30rpx 0 30rpx;
  6 + box-sizing: border-box;
  7 + background-color: #e7f5fb;
  8 +}
  9 +
  10 +.content {
  11 + width: 100%;
  12 + /* height: 100%; */
  13 + border-radius: 25rpx;
  14 + /* padding: 30rpx; */
  15 + background-color: #fff;
  16 +}
  17 +
  18 +.content .work {
  19 + text-align: center;
  20 + padding: 60rpx 0 30rpx 0;
  21 + font-size: 36rpx;
  22 +}
  23 +
  24 +.content .ready {
  25 + display: flex;
  26 + flex-direction: column;
  27 + align-items: center;
  28 + margin-bottom: 40rpx
  29 +}
  30 +.content .ready1 {
  31 + display: flex;
  32 + flex-direction: column;
  33 + align-items: center;
  34 + padding-bottom: 50rpx ;
  35 + /* margin-bottom: 40rpx */
  36 +}
  37 +
  38 +.hengxian {
  39 + position: relative;
  40 + top: -15rpx;
  41 + width: 40rpx;
  42 + margin-left: 50%;
  43 + transform: translateX(-50%);
  44 + border: 1rpx solid #5edadc;
  45 +}
  46 +
  47 +.shuxian {
  48 + width: 2rpx;
  49 + background-color: #f5f5f5;
  50 + margin: 0 30rpx;
  51 +}
  52 +
  53 +.content .image {
  54 + display: flex;
  55 + width: 75%;
  56 + height: 300rpx;
  57 +}
  58 +
  59 +.content .image_1 {
  60 + display: flex;
  61 + width: 55%;
  62 + height: 450rpx;
  63 + margin: 0 auto;
  64 +}
  65 +
  66 +.content image {
  67 + height: 100%;
  68 +}
  69 +.btn {
  70 +
  71 + /* height: 150rpx; */
  72 + /* margin-left: 50%; */
  73 + margin: 70rpx 0 30rpx 50%;
  74 + transform: translateX(-50%);
  75 + background: #4bd6df;
  76 + padding: 20rpx;
  77 + width: 50%;
  78 + text-align: center;
  79 + border-radius: 40rpx;
  80 + color: #fff;
  81 +}
  82 +.btn_fixed {
  83 + position: fixed;
  84 + width: 100%;
  85 + bottom: 0;
  86 + height: 300rpx;
  87 + background: #e7f5fb;
  88 +}
  89 +.notice {
  90 + text-align: center;
  91 + color: red;
  92 + font-size: 28rpx;
  93 +}
0 94 \ No newline at end of file
... ...