1.4.9

app.json

@@ -1,10 +1,12 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/index/test",
     "pages/index/accredit",
     "pages/index/openSetting",
 
+    "pages/test/index",
+    "pages/test/item",
+
     "pages/main/default",
     "pages/main/cardInfo",
     "pages/main/preview",

pages/index/test.js

@@ -1,104 +0,0 @@
-Page({
-  data:{
-    optionList:[
-      {
-        name: "标题1",
-        subname: "副标题1"
-      }, {
-        name: "标题2",
-        subname: "副标题2"
-      }, {
-        name: "标题3",
-        subname: "副标题3"
-      }, {
-        name: "标题4",
-        subname: "副标题4"
-      },
-    ],
-    kelong: {
-      top: 0,
-      xt: '',
-      name: '',
-      subname: ''
-    },
-    replace: {
-      xt: '',
-      name: '',
-      subname: ''
-    },
-  },
-  dragStart: function (e) {
-    var that = this
-    var kelong = that.data.kelong
-    var i = e.currentTarget.dataset.index
-    kelong.name = this.data.optionList[i].name
-    kelong.subname = this.data.optionList[i].subname
-
-    var query = wx.createSelectorQuery();
-    //选择id
-    query.select('.listbox').boundingClientRect(function (rect) {
-      // console.log(rect.top)
-      kelong.top = e.changedTouches[0].clientY - rect.top - 30
-      that.setData({
-        kelong: kelong,
-        showkelong: true
-      })
-    }).exec();
-  },
-  dragMove: function (e) {
-    var that = this
-    var i = e.currentTarget.dataset.index
-    var query = wx.createSelectorQuery();
-    var kelong = that.data.kelong
-    var listnum = that.data.optionList.length
-    var optionList = that.data.optionList
-    query.select('.listbox').boundingClientRect(function (rect) {
-      kelong.top = e.changedTouches[0].clientY - rect.top - 30
-      if (kelong.top < -60) {
-        kelong.top = -60
-      } else if (kelong.top > rect.height) {
-        kelong.top = rect.height - 60
-      }
-      that.setData({
-        kelong: kelong,
-      })
-
-      console.log(kelong.top);
-    }).exec();
-
-    
-  },
-  dragEnd: function (e) {
-    var that = this
-    var i = e.currentTarget.dataset.index
-    var query = wx.createSelectorQuery();
-    var kelong = that.data.kelong
-    var listnum = that.data.optionList.length
-    var optionList = that.data.optionList
-    query.select('.listbox').boundingClientRect(function (rect) {
-      kelong.top = e.changedTouches[0].clientY - rect.top - 30
-      if (kelong.top < -20) {
-        wx.showModal({
-          title: '删除提示',
-          content: '确定要删除此条记录？',
-          confirmColor: '#e4463b'
-        })
-      }
-      var target = parseInt(kelong.top / 60)
-      var replace = that.data.replace
-      if (target >= 0) {
-        replace.xt = optionList[target].xt
-        replace.name = optionList[target].name
-        replace.subname = optionList[target].subname
-        optionList[target].name = optionList[i].name
-        optionList[target].subname = optionList[i].subname
-        optionList[i].name = replace.name
-        optionList[i].subname = replace.subname
-      }
-      that.setData({
-        optionList: optionList,
-        showkelong: false
-      })
-    }).exec();
-  },
-})

pages/index/test.wxml

@@ -1,19 +0,0 @@
-<view class='listbox'>
-    <view class='kelong list' hidden='{{!showkelong}}' style='top:{{kelong.top}}px'>
-      <view class='index'>?</view>
-      <view class='info'>
-        <view class="name">{{kelong.name}}</view>
-        <view class='sub-name'>{{kelong.subname}}</view>
-      </view>
-      <view class='moreiconpl'>三</view>
-    </view>
-
-    <view class='list FlexRow' wx:for="{{optionList}}" wx:key="">
-      <view class='index'>{{index+1}}</view>
-      <view class='info'>
-        <view class="name">{{item.name}}</view>
-        <view class='sub-name'>{{item.subname}}</view>
-      </view>
-      <view class='moreiconpl' data-index='{{index}}' catchtouchstart='dragStart' catchtouchmove='dragMove' catchtouchend='dragEnd'>三</view>
-    </view>
-  </view>

pages/index/test.wxss

@@ -1,65 +0,0 @@
-.map-list .list {
-  position: relative;
-  height: 120rpx;
-  width: 100%;
-  justify-content: space-between;
-}
-
-.map-list .kelong {
-  position: absolute;
-}
-
-.map-list .list::after {
-  content: '';
-  width: 660rpx;
-  height: 2rpx;
-  background-color: #eee;
-  position: absolute;
-  right: 0;
-  bottom: 0;
-}
-
-.map-list .list .xt {
-  display: block;
-  width: 95rpx;
-  height: 77rpx;
-  position: absolute;
-  left: 93rpx;
-  top: 20rpx;
-}
-
-.map-list .list .more {
-  display: block;
-  width: 48rpx;
-  height: 38rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 40rpx;
-}
-
-.map-list .list .info {
-  display: block;
-  width: 380rpx;
-  height: 80rpx;
-  position: absolute;
-  left: 220rpx;
-  top: 20rpx;
-  font-size: 30rpx;
-}
-
-.map-list .list .info .sub-name {
-  font-size: 28rpx;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #646567;
-}
-
-.map-list .list .index {
-  color: #e4463b;
-  font-size: 32rpx;
-  font-weight: bold;
-  position: absolute;
-  left: 35rpx;
-  top: 40rpx;
-}

pages/test/index.js

@@ -0,0 +1,97 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    MainList: [
+      {
+        Category: "数学",
+        List: [
+          {
+            ID: 1,
+            Name: "20以内加减法",
+          }, {
+            ID: 2,
+            Name: "乘法口诀",
+          },
+        ]
+      },
+      {
+        Category: "识字",
+        List: [
+          {
+            ID: 1,
+            Name: "一年级上学期",
+          }, {
+            ID: 2,
+            Name: "一年级下学期",
+          }, {
+            ID: 3,
+            Name: "二年级上学期",
+          }, {
+            ID: 4,
+            Name: "二年级下学期",
+          }, {
+            ID: 5,
+            Name: "三年级上学期",
+          }, {
+            ID: 6,
+            Name: "三年级下学期",
+          },
+        ]
+      }, {
+        Category: "写字",
+        List: [
+          {
+            ID: 1,
+            Name: "一年级上学期",
+          }, {
+            ID: 2,
+            Name: "一年级下学期",
+          }, {
+            ID: 3,
+            Name: "二年级上学期",
+          }, {
+            ID: 4,
+            Name: "二年级下学期",
+          }, {
+            ID: 5,
+            Name: "三年级上学期",
+          }, {
+            ID: 6,
+            Name: "三年级下学期",
+          },
+        ]
+      }, {
+        Category: "英语",
+        List: [
+          {
+            ID: 1,
+            Name: "动物",
+          }, {
+            ID: 1,
+            Name: "食物",
+          }, {
+            ID: 1,
+            Name: "人体",
+          },
+        ]
+      },
+    ]
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/test/index.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "测一测"
+}

pages/test/index.wxml

@@ -0,0 +1,21 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:for="{{MainList}}" wx:key="index">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">{{item.Category}}</view>
+      <view class="panelTitle2"></view>
+    </view>
+    <block wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap='goto' data-url="./item?id=">
+        <view class="panelItem1">{{itemChild.Name}}</view>
+        <view class="panelItem2 FlexRow">
+          <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+        </view>
+      </view>
+    </block>
+    <view class='lineFooter'></view>
+  </block>
+  <view style='width:100%;height:100rpx;'></view>
+</view>

pages/test/index.wxss

@@ -0,0 +1,61 @@
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+.panelTitle .panelTitle2{
+  font-size:28rpx;
+  margin-right: 30rpx;
+  background-color: #1e1e1e;
+  color:#fff;
+  border-radius: 22rpx;
+  text-align: center;
+  padding: 0 20rpx;
+  margin-bottom: 32rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+.panelItem0{
+  height:133rpx;
+}
+.panelItem00{
+  margin-top: 50rpx;
+  line-height: 100rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: center;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+
+.text1{
+  font-size:24rpx;
+  text-align: center;
+  color:#787878;
+}

pages/test/item.js

@@ -0,0 +1,30 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      Color: {
+        ID: 0,
+        Name: "黑白",
+        BackColor: "#fff",
+        BackColor2: "#eee",
+        LineColor: "#eee",
+        FieldColor: "#ddd",
+      },
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/test/item.wxml

@@ -0,0 +1,6 @@
+<import src="../template/cardShow.wxml" />
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,LimitTimeStr:LimitTimeStr,ShowType:ShowType}}" />
+  
+  <view style='width:100%;height:100rpx;'></view>
+</view>

pages/test/item.wxss

@@ -0,0 +1,230 @@
+
+/* 段落显示************************ */
+
+.editFieldNull{
+  height:50rpx;
+}
+.editFieldNull1{
+  height:40rpx;
+}
+.editFieldNull2{
+  height:60rpx;
+}
+.editFieldNull3{
+  height:30rpx;
+}
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
+}
+
+.panelField1 {
+  width: 100%;
+  justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
+}
+
+.panelField11 {
+  font-size: 48rpx;
+  justify-content: flex-start;
+  color: #fff;
+}
+
+.panelTag {
+  width: 100%;
+  min-height: 95rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin-top: 60rpx;
+  z-index: 5;
+}
+
+.panelTag .panelTagLine {
+  margin: 0 0 0 50rpx;
+  max-width: 650rpx;
+  height: 10rpx;
+}
+
+.panelTag .panelTag1 {
+  margin: 0 0 0 50rpx;
+  width: 650rpx;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.panelTag .tag {
+  font-size: 46rpx;
+  margin: 0 30rpx 20rpx 0;
+  font-weight: 400;
+  color: #F1AB1E;
+}
+
+.right2 {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 134rpx;
+  height: 150rpx;
+  align-items: flex-start;
+}
+
+.universalpic_show_white_30x30 {
+  width: 36rpx;
+  height: 36rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.universalpic_hide_white_34x34 {
+  width: 36rpx;
+  height: 20rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.panelField20 {
+  width: 100%;
+  justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
+}
+
+.panelField2 {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  border-radius: 20rpx;
+}
+
+.panelField21 {
+  width: 650rpx;
+  font-size: 36rpx;
+  margin: 40rpx;
+  line-height: 66rpx;
+}
+
+.panelItem .panelSound {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 10rpx 0 0;
+  background-color: #fff;
+  border-radius: 50%;
+}
+
+.panelItem .panelSoundHover {
+  background-color: #d2d2d2;
+}
+.panelItem .panelSoundHover1 {
+  color: #d2d2d2;
+}
+
+.panelItem .universalpic_starting_tc01_26x26{
+  width: 26rpx;
+  height: 26rpx;
+  margin: 10rpx 20rpx 10rpx 0;
+}
+
+.panelItem .universalpic_read_mark_black_20x20 {
+  width: 21rpx;
+  height: 20rpx;
+}
+
+.panelItem .panelRecorder {
+  width:100%;
+  justify-content: flex-start;
+}
+.panelItem .panelRecorder0 {
+  width: 168rpx;
+  height: 70rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+}
+
+.panelItem .universalpic_voicerecorder_transmit_black_44x34{
+  width: 44rpx;
+  height: 34rpx;
+}
+
+.panelItem .textProblem{
+  padding: 3rpx 20rpx;
+  background-color: #F1AB1E;
+  border-radius: 22rpx;
+  text-align: center;
+  font-size:28rpx;
+  line-height: 45rpx;
+  font-weight: 500;
+  color:#1e1e1e;
+  margin: 0 0 10rpx 0;
+}
+
+.panelItem .textDot{
+  color: #F1AB1E;
+  font-size:36rpx;
+  margin-right: 20rpx;
+}
+
+.panelItem .textLine {
+  text-decoration: underline;
+}
+
+
+.panelItem .textHighlighter {
+  color:#1E1E1E;
+}
+
+.panelItem .textNormal {
+  min-height: 50rpx;
+}
+
+.panelItem .textNormal2 {
+  font-size: 36rpx;
+}
+
+.panelItem .textPinyin {
+  text-decoration: underline;
+  margin-right: 10rpx;
+}
+
+
+.panelItem .imageContainer {
+  width: 650rpx;
+  margin: 6rpx 0;
+  border-radius: 20rpx;
+  background-color: rgba(0,0,0,0.1);
+}
+
+.panelItem .imageFree {
+  width: 650rpx;
+  border-radius: 6rpx;
+}
+
+
+.panelItem .imageContainer2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+  background-color: rgba(0,0,0,0.1);
+}
+.panelItem .imageFree2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+}
+
+.panelItem .textBr {
+  width: 100%;
+  height: 24rpx;
+}
+
+.panelItem .textReturn {
+  width: 100%;
+}
+
+.panelItem .textReturn2 {
+  width: 100%;
+  height: 30rpx;
+}
+
+/* ******************************** */

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 9,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,
@@ -107,13 +107,6 @@
 					"query": "",
 					"scene": null
 				},
-				{
-					"id": -1,
-					"name": "pages/index/test",
-					"pathName": "pages/index/test",
-					"query": "",
-					"scene": null
-				},
 				{
 					"id": 9,
 					"name": "pages/index/index",