删除冗余图片

app.json

@@ -6,7 +6,6 @@
     "pages/main/class/class",
     "pages/main/books/books",
     "pages/main/week/week",
-    "pages/main/singleBook/singleBook",
     "pages/main/reading/reading",
     "pages/main/searchResult/searchResult",
     "pages/groupPage/discount-group/discount-group",

component/group/group.wxml

@@ -26,28 +26,13 @@
           </view>
         </block>
         <view class="change" bindtap="change">换一换</view>
-        <!--
-        <view class="less-group">
-          <view class="group-box">
-            <block wx:for="{{groupData.recommendList}}" wx:key="{{index}}">
-              <view class="group-item" bindtap="groupDetail" data-ind="{{index}}" data-id="{{item.id}}" data-productId="{{item.productId}}" data-groupId="{{item.groupId}}">
-                <image class="item-img" src="{{item.iconImg}}"></image>
-                <view>拼团价 <text>￥{{item.price / 100}}</text></view>
-                <view>原价 <text style="text-decoration: line-through;">￥{{item.originPrice / 100}}</text></view>
-                <view class="group-num">
-                  <image src="../../static/groupImg/Rectangle_30.png" ></image>
-                  <text>{{item.headcount}}人团</text>
-                </view>
-              </view>
-            </block>                 
-          </view>
-        </view>
-        -->
       </view>
       <view class="title">
         <image class="ren" src="../../static/groupImg/Shape3.png" style="width: 30rpx; height: 38rpx;"></image>
         <text class="left">全部课程</text>
-        <text class="right" bindtap="more" data-type="course">更多 ></text>
+        <view class="right" bindtap="more" data-type="course">更多
+          <image src="../../static/image/to.png" />
+        </view>
       </view>
       <view class="whole-group">
           <view class="group-box"> 
@@ -60,38 +45,7 @@
           </view>
         </view>
     </scroll-view>
-    <!--
-    <view class="Collage-bottom {{groupData.isIPX ? 'Collage-bottomx' :''}}">
-      <image class="bg" src="../../static/groupImg/Rectangle_9.png"></image>
-      <view bindtap="sendGroup">
-        <image src="../../static/groupImg/Shape1@2x.png"></image>
-        <text>发起团购</text>
-      </view>
-      <view bindtap="myGroup">
-        <image src="../../static/groupImg/Shape2@2x.png" style="width: 50rpx; height: 50rpx;"></image>
-        <text>我的拼团</text>
-      </view>
-    </view>
-    -->
-  </view>
-  <!--
-  <view class="group-popup" bindtap="sendGroup" hidden="{{groupData.sendGroupFlag}}">
-      <view class="group-content">
-        <view class="group-title">请选择课本</view>
-        <view class="group-list">
-          <block wx:for="{{groupData.bookList}}" wx:key="{{index}}">
-              <view class="group-item" catchtap="selectImg" data-ind="{{index}}">
-                <image class="item-img" src="{{item.iconImg}}"></image>
-                <view id="grade">{{item.subTitle}}</view>
-                <image class="select-img" src="../../static/groupImg/{{groupData.selectFlag[index] ? 'bai' : 'lan'}}.png"></image>
-              </view> 
-          </block>
-        </view>
-        <view class="sure" catchtap="sure">
-          <image src="../../static/groupImg/sure.png"></image>
-          <text>确定</text>
-        </view>
-      </view>
+   
   </view>
-  -->
+
 </template>

component/group/group.wxss

@@ -145,9 +145,17 @@ scroll-view {
 }
 
 .title .right {
+    display: flex;
+    /* flex-direction: row; */
+    align-items: center;
     font-size: 28rpx;
 }
 
+.title .right image {
+    width: 16rpx;
+    height: 28rpx;
+    margin-left:14rpx;
+}
 
 .group-box {
     display: flex;
@@ -160,7 +168,7 @@ scroll-view {
 .group-item {
     position: relative;
     display: flex;
-    margin-right:35rpx;
+    margin-right: 35rpx;
 
     flex-direction: column;
 }
@@ -194,11 +202,11 @@ scroll-view {
 }
 
 .Collage-bottom {
- display: flex;
- justify-content: space-around;
- align-items: center;
- height: 102rpx;
- position: relative;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    height: 102rpx;
+    position: relative;
 }
 
 .Collage-bottomx {
@@ -239,7 +247,7 @@ scroll-view {
     position: absolute;
     left: 50%;
     top: 50%;
-    transform: translate(-50%,-50%);
+    transform: translate(-50%, -50%);
     width: 80%;
     background: #fff;
     border-radius: 20rpx;
@@ -256,13 +264,15 @@ scroll-view {
     flex-wrap: wrap;
     padding: 0 62rpx;
 }
-.group-list .group-item{
+
+.group-list .group-item {
     position: relative;
     display: flex;
-    margin-right:0;
+    margin-right: 0;
     justify-content: space-between;
     /* flex-direction: column; */
 }
+
 .group-content-img {
     width: 214rpx;
     height: 290rpx;

component/hot/hot.wxss

@@ -118,8 +118,9 @@ swiper {
 }
 
 .title .moreBtn image {
-    width: 21rpx;
-    height: 25rpx;
+    width:16rpx;
+height:28rpx;
+
 }
 
 .hotWares {

component/my/my.wxml

@@ -46,7 +46,7 @@
           <view class='color'>{{ myData.user.fansAmount || 0 }}</view>
           <view class='border-right'>
             <view class='red-heart'>
-              <image src='../../static/image/redheart.png'></image>
+              <image src='../../static/image/fully_heart.png'></image>
             </view>
             <text>关注</text>
           </view>

component/my/my.wxss

@@ -223,6 +223,7 @@ image{
   height: 32rpx;
   color: #FFFFFF;
   font-size: 32rpx;
+  line-height:46rpx;
 }
 
 .wallet-module{

component/share/share.js

@@ -305,7 +305,6 @@ Component({
         // ctx.setFillStyle('red')
         ctx.fillText(`《${this.data.title}》`, (375 - ctx.measureText(`《${this.data.title}》`).width) / 2, 322)
         
-        // ctx.drawImage('../../../static/image/reading_poster.jpg', 11, 276, 351, 145);
         ctx.setFontSize(16)
         ctx.setFillStyle('#000')
         // ctx.setFillStyle('#000')
@@ -340,7 +339,6 @@ Component({
         if(this.data.groupPurchaseInfo.productId === 3){
           ctx.drawImage('../../../static/share/poster_3.jpg', 12, 176, 351, 145);
         }
-        // ctx.drawImage('../../../static/groupImg/Rectangle 41.png', 134, 358, 59, 20);
         ctx.setFontSize(17)
         ctx.setFillStyle('#A95A00')
         ctx.fillText(`${this.data.groupPurchaseInfo.headcount}人团`,  96, 412)

pages/commonWxs/format.wxs

@@ -1,6 +1,8 @@
 function formatDate(time) {
   var t = getDate(time);
-  var tf = function (i) { return (i < 10 ? '0' : '') + i };
+  var tf = function (i) {
+    return (i < 10 ? '0' : '') + i
+  };
   var year = t.getFullYear();
   var month = tf(t.getMonth() + 1);
   var day = tf(t.getDate());
@@ -11,7 +13,9 @@ function formatDate(time) {
 
 function getBirthday(birthday) {
   var t = getDate(birthday);
-  var tf = function (i) { return (i < 10 ? '0' : '') + i };
+  var tf = function (i) {
+    return (i < 10 ? '0' : '') + i
+  };
   var year = t.getFullYear();
   var month = tf(t.getMonth() + 1);
   var day = tf(t.getDate());

pages/groupPage/grade-details/grade-details.wxml

@@ -13,9 +13,9 @@
             <view class="catalog-item" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToClass">
                 <text class="left">{{item.title}}</text>
                 <view class="right">
-                    <!-- <image src="../../../static/groupImg/bofnag.png"></image>
+                    <!-- <image src="../../../static/image/play.png"></image>
                     <text>{{item.readNum}}</text> -->
-                    <image style="margin-left: 10rpx; width: 22rpx; height: 22rpx;" src="../../../static/groupImg/jiantou.png"></image>
+                    <image  src="../../../static/image/to.png"></image>
                 </view>
             </view>
         </view>

pages/groupPage/grade-details/grade-details.wxss

@@ -102,8 +102,8 @@ scroll-view {
 }
 
 .catalog-item .right image {
-    width: 26rpx;
-    height: 26rpx;
+    width: 16rpx;
+    height: 28rpx;
     vertical-align: middle;
     margin-right: 6rpx;
 }

pages/groupPage/group-details/group-details.wxml

@@ -55,9 +55,9 @@
             <view class="catalog-item" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToClass">
                 <text class="left">{{item.title}}</text>
                 <view class="right">
-                    <!-- <image src="../../../static/groupImg/bofnag.png"></image>
+                    <!-- <image src="../../../static/image/play.png"></image>
                     <text>{{item.readNum}}</text> -->
-                    <image style="margin-left: 10rpx; width: 22rpx; height: 22rpx;" src="../../../static/groupImg/jiantou.png"></image>
+                    <image  src="../../../static/image/to.png"></image>
                 </view>
             </view>           
         </view>

pages/groupPage/group-details/group-details.wxss

@@ -181,8 +181,8 @@ scroll-view {
 }
 
 .catalog-item .right image {
-    width: 26rpx;
-    height: 26rpx;
+    width: 16rpx;
+    height: 28rpx;
     vertical-align: middle;
     margin-right: 6rpx;
 }

pages/groupPage/my-group/my-group.wxml

@@ -27,16 +27,7 @@
                 </view>
             </view>
           </block>
-            <!--
-            <block wx:for="{{myGroupList}}" wx:key="{{index}}">
-                <view class="group-item" bindtap="collageDetails" data-ind="{{index}}" data-num="{{item.status==='SUCCESSED'}}" data-orderId="{{item.id}}" data-groupId="{{item.groupId}}" data-productId="{{item.productId}}" data-uid="{{item.organizer}}">
-                    <image class="item-img" src="{{item.iconImg}}" ></image>
-                    <view id="grade">{{item.groupTitle}}</view>
-                    <image class="jiang" src="../../../static/groupImg/jiang.png" wx:if="{{(item.groupType== 'PROMOTION') && (item.status==='SUCCESSED') }}"></image>
-                    <image class="type-img" src="../../../static/groupImg/{{item.status==='SUCCESSED' ? 'yisuccess' : 'weisuccess' }}.png"></image>
-                </view> 
-            </block>
-            -->
+           
         </view>
     </scroll-view>
 </view>

pages/main/singleBook/singleBook.js

@@ -1,45 +0,0 @@
-import httpRequestApi from '../../../utils/APIClient';
-Page({
-    data: {
-        titleIcon: '',
-        title: '',
-        bookInfo: '',
-        lessonList: []
-    },
-    onLoad: function (options) {
-        wx.setNavigationBarTitle({
-            title: options.title
-        })
-        const uid= wx.getStorageSync('uid');
-        console.log(options.id)
-        httpRequestApi.getBookDetail(uid, options.id).success((res) => {
-            console.log(res.data.data)
-            const bookInfo = res.data.data.product;
-            const lessonList = res.data.data.lessonList;
-            this.setData({
-                titleIcon: bookInfo.bgImg,
-                title: bookInfo.title,
-                bookInfo: bookInfo.description
-            })
-            const lessonTemp = [];
-            lessonList.forEach(item => {
-                const temp = {};
-                temp.id = item.id;
-                temp.title = item.title;
-                temp.readNum = item.readCount;
-                lessonTemp.push(temp);
-            });
-            this.setData({
-                lessonList: lessonTemp
-            });
-            console.log(this.data.lessonList)
-        });
-    },
-    goToClass: function(e){
-        let id = e.currentTarget.dataset.id;
-        let title = e.currentTarget.dataset.title;
-        wx.navigateTo({
-            url: `../class/class?id=${id}&title=${title}`
-          })
-    }
-})

pages/main/singleBook/singleBook.json

@@ -1 +0,0 @@
-{}

pages/main/singleBook/singleBook.wxml

@@ -1,24 +0,0 @@
-<view class="bookDetail">
-    <view class="headSection">
-        <image class="titleIcon" src="{{titleIcon}}" />
-        <text class="bookName">{{title}}</text>
-        <text class="bookInfo">{{bookInfo}}</text>
-    </view>
-    <view class="dirTag">
-        <!-- <image src="" /> -->
-        <image src="../../../static/image/menu_wrapper.png" />
-        <text >课文目录</text>
-    </view>
-    <view class="listSection">
-        <view class="classItem" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToClass">
-            <text class="classTitle">{{item.title}}</text>
-            <text class="readingNum">{{item.readingNum}}朗读 ></text>
-        </view>
-    </view>
-    <view class="footerSection">
-        <view class="footerBuy">
-            <text class="buyPrice"></text>
-            <text class="buyProduct"></text>
-        </view>
-    </view>
-</view>

pages/main/singleBook/singleBook.wxss

@@ -1,80 +0,0 @@
-.bookDetail{
-    font-size: 32rpx;
-    color: #414141;
-    background: #f0f1f5;
-}
-.headSection{
-    padding-top: 18rpx;
-    width: 100%;
-    background: #fff;
-}
-.headSection .titleIcon{
-    display: block;
-    width: 704rpx;
-    height: 190rpx;
-    margin: 0 auto;
-    background: #fff;
-}
-.headSection .bookName{
-    width: 700rpx;
-    height: 42rpx;
-    line-height: 42rpx;
-    margin: 10rpx 0 12rpx 20rpx;
-}
-.headSection .bookInfo{
-    width: 700rpx;
-    height: auto;
-}
-.dirTag{
-    width: 100%;
-    height: 100rpx;
-    margin-top: 12rpx;
-    background: #fff;
-    position: relative;
-
-}
-.dirTag image{
-    position: absolute;
-    left: 42rpx;
-    top: 22rpx;
-    width: 206rpx;
-    height: 42rpx;
-}
-.dirTag text{
-    position: absolute;
-    left: 56rpx;
-    top: 22rpx;
-    width: 150rpx;
-    height: 42rpx;
-    font-size: 32rpx;
-    color: #fff;
-}
-.listSection{
-    width: 100%;
-    margin-top: 12rpx;
-}
-.listSection .classItem{
-    width: 716rpx;
-    height: 88rpx;
-    margin: 0 auto 8rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    background: #fff;
-    border-radius: 14rpx;
-}
-.classItem .classTitle{
-    width: auto;
-    height: 88rpx;
-    font-size: 32rpx;
-    margin-left: 40rpx;
-    line-height: 88rpx;
-}
-.classItem .readingNum{
-    width: auto;
-    height: 88rpx;
-    line-height: 88rpx;
-    margin-right: 40rpx;
-    color: #939393;
-    font-size: 28rpx;
-}