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

abson
2 parents 5c911f6a c759f8d6
Showing 4 changed files with 7 additions and 50 deletions
packageD/pages/AI-test-skin/fail_result/fail_result.wxml
packageD/pages/AI-test-skin/fail_result/fail_result.wxss
packageD/pages/AI-test-skin/success_result/success_result.wxml
packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -3,7 +3,7 @@
         <view>
             <view style="position: relative;display: inline-block">
                 <text class="iconfont icon-tupian" style="color: #4bd6df;font-size: 80rpx"></text>
-                <text class="iconfont icon-prompt-filling" style="color:red;font-size: 40rpx;position:absolute;left: -8rpx;top: 0;"></text>
+                <text class="iconfont .icon-infofill" style="color:red;font-size: 40rpx;position:absolute;left: -8rpx;top: 0;"></text>
             </view>
         </view>
         <view  style="font-size:32rpx;color: #333">上传图片符合要求</view>
@@ -14,7 +14,7 @@
     <view style="padding:60rpx; padding-bottom: 70rpx;">
         <view style="font-size: 32rpx;">失败原因：</view>
         <view style="font-size: 26rpx;display: flex;align-items: center; margin-top: 20prx">
-            <text class="iconfont icon-account" style="font-size: 56rpx;margin-right: 20rpx"></text>
+            <text class="iconfont icon-geren" style="font-size: 56rpx;margin-right: 20rpx"></text>
             <view>{{msg}}</view>
         </view>
     </view>
@@ -60,43 +60,10 @@ page {
     justify-content: center;
 }
 .ac{align-items: center}
-
-@font-face {
-    font-family: 'iconfont';
-    /* project id 2125414 */
-    src: url('//at.alicdn.com/t/font_2125414_o4quhtfqnbr.eot');
-    src: url('//at.alicdn.com/t/font_2125414_o4quhtfqnbr.eot?#iefix') format('embedded-opentype'),
-    url('//at.alicdn.com/t/font_2125414_o4quhtfqnbr.woff2') format('woff2'),
-    url('//at.alicdn.com/t/font_2125414_o4quhtfqnbr.woff') format('woff'),
-    url('//at.alicdn.com/t/font_2125414_o4quhtfqnbr.ttf') format('truetype'),
-    url('//at.alicdn.com/t/font_2125414_o4quhtfqnbr.svg#iconfont') format('svg');
-}
-
-.icon-pic:before {
-    content: "\e620";
-}
-
 .t_c{text-align: center}
  
  
-@font-face {
-    font-family: "iconfont"; /* Project id 3188718 */
-    src: url('iconfont.woff2?t=1645080046840') format('woff2'),
-    url('iconfont.woff?t=1645080046840') format('woff'),
-    url('iconfont.ttf?t=1645080046840') format('truetype');
-}
  
-.icon-tupian:before {
-    content: "\e997";
-}
-
-.icon-account:before {
-    content: "\e6a3";
-}
-
-.icon-prompt-filling:before {
-    content: "\e68b";
-}
  
  
  
@@ -120,10 +120,10 @@
  
  
 <view class="mask" catchtap="close_mask" wx:if="{{showDialog || question_dialog}}"></view>
-<cover-view bindtap="saveImageToPhotosAlbum" class="share fs28">
-    <cover-view class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></cover-view>
-    <cover-view>分享</cover-view>
-</cover-view>
+<view bindtap="saveImageToPhotosAlbum" class="share fs28">
+    <view class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></view>
+    <view>分享</view>
+</view>
  
 <!-- 问题标注 -->
 <view class="dialog {{img_scale?'scale':'fangda'}}" wx:if="{{showDialog}}">
@@ -386,7 +386,7 @@
 <view id="share_show" wx:if="{{share_show}}">
     <view class="cover-layer" bindtap="close_share" style="z-index: 77777"></view>
     <view class="share_content">
-        <view class="sh_close" bindtap="close_share"><text class="iconfont icon-close"></text></view>
+        <view class="sh_close" bindtap="close_share"><text class="iconfont icon-guan"></text></view>
         <image src="{{shareImgPath}}" style="width: 100%" mode="widthFix"></image>
         <view class="share_save_btn" bindtap="savePic">保存到相册</view>
     </view>
@@ -753,16 +753,6 @@ page {
     color: #fff
 }
  
-@font-face {
-    font-family: "iconfont";
-    /* Project id  */
-    src: url('iconfont.ttf?t=1645607343376') format('truetype');
-}
-
-.icon-close:before {
-    content: "\e668";
-}
-
 .e_tou {
     width: 50rpx;
     height: 20rpx;