更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/position/PositionReportServiceImpl.java

@@ -5,6 +5,7 @@ import com.iotechn.unimall.core.exception.AdminServiceException;
 import com.iotechn.unimall.core.exception.ExceptionDefinition;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.domain.*;
+import com.iotechn.unimall.data.enums.TradeStatusType;
 import com.iotechn.unimall.data.mapper.*;
 import com.iotechn.unimall.data.model.Page;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -60,6 +61,7 @@ public class PositionReportServiceImpl implements PositionReportService {
         if (selectDTO != null && !StringUtils.isEmpty(selectDTO.getLibraryRollCall())) {
             storeDOWrapper.like("name", "%" + selectDTO.getLibraryRollCall() + "%");
         }
+        storeDOWrapper.eq("company_id",companyId);
         List<StoreDO> storeDOList = storeMapper.selectList(storeDOWrapper);
         Integer count = storeMapper.selectCount(storeDOWrapper);
         List<PositionReportDO> positionReportDOS = new ArrayList<>();
@@ -75,7 +77,7 @@ public class PositionReportServiceImpl implements PositionReportService {
                 // 采购
                 List<BuyDO> buyDOList = buyMapper.selectList(new EntityWrapper<BuyDO>().eq("store_id", storeDO.getId()));
                 for (BuyDO buyDO : buyDOList) {
-                    List<TradeDO> list = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("salebuy_id", buyDO.getId()));
+                    List<TradeDO> list = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("salebuy_id", buyDO.getId()).lt("status", TradeStatusType.FINISH.getCode()).ge("status", TradeStatusType.VERIFY.getCode()));
                     for (TradeDO tradeDO : list) {
                         sum = sum + (tradeDO.getFlatTotal() != null ? tradeDO.getFlatTotal() : 0);
                         sum2 = sum2 +tradeDO.getCount();
@@ -85,7 +87,7 @@ public class PositionReportServiceImpl implements PositionReportService {
                 // 交易
                 List<SaleDO> saleDOList = saleMapper.selectList(new EntityWrapper<SaleDO>().eq("store_id", storeDO.getId()));
                 for (SaleDO saleDO : saleDOList) {
-                    List<TradeDO> list = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("salebuy_id", saleDO.getId()));
+                    List<TradeDO> list = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("salebuy_id", saleDO.getId()).lt("status", TradeStatusType.FINISH.getCode()).ge("status", TradeStatusType.VERIFY.getCode()));
                     for (TradeDO tradeDO : list) {
                         sum1 = sum1 + tradeDO.getCount();
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/report/ReportServiceImpl.java

@@ -479,6 +479,7 @@ public class ReportServiceImpl implements ReportService {
         List<ReportDTO> list = reportDTO.getList();
 
         Float money = reportDTO.getPayMoney();
+        Long userId = null;
         for (int i = 0; i < list.size(); i++) {
             ReportDTO tmp = list.get(i);
             BuyReportDO buyReportDO = buyReportMapper.selectById(tmp.getId());
@@ -502,6 +503,7 @@ public class ReportServiceImpl implements ReportService {
             buyReportDO.setPayDate(sdf.parse(reportDTO.getPayDateStr()));
             buyReportDO.setAdminId(adminId);
             if (buyReportMapper.updateById(buyReportDO) > 0) {
+                userId = buyReportDO.getUserId();
                 List<TradeDO> tradeDOList = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("trade_contract_no", buyReportDO.getContractNo()));
                 if (CollectionUtils.isNotEmpty(tradeDOList)) {
 //                    Map<String, Object> map = new HashMap<>();
@@ -551,7 +553,7 @@ public class ReportServiceImpl implements ReportService {
             map.put("valueOne", sdf.format(new Date()));
             map.put("url", reportDTO.getPayImg());
             map.put("templateId", "3NM7ujI5vuJSdYlHJAPcYiacrg2YvuyT1Y7BZf9qeNc");
-            map.put("userId", 21);
+            map.put("userId", userId);
             map.put("header", "您有新的收款，请及时查收");
             map.put("remark", "点击查看凭证");
             sendUtils.sendMessageForPay(map);
@@ -567,6 +569,7 @@ public class ReportServiceImpl implements ReportService {
         List<ReportDTO> list = reportDTO.getList();
 
         Float money = reportDTO.getPayMoney();
+        Long userId = null;
         for (int i = 0; i < list.size(); i++) {
             ReportDTO tmp = list.get(i);
             SaleReportDO saleReportDO = saleReportMapper.selectById(tmp.getId());
@@ -590,6 +593,7 @@ public class ReportServiceImpl implements ReportService {
             saleReportDO.setPayDate(sdf.parse(reportDTO.getPayDateStr()));
             saleReportDO.setAdminId(adminId);
             if (saleReportMapper.updateById(saleReportDO) > 0) {
+                userId = saleReportDO.getUserId();
                 List<TradeDO> tradeDOList = tradeMapper.selectList(new EntityWrapper<TradeDO>().eq("trade_contract_no", saleReportDO.getContractNo()));
                 if (CollectionUtils.isNotEmpty(tradeDOList)) {
 //                    Map<String, Object> map = new HashMap<>();
@@ -638,7 +642,7 @@ public class ReportServiceImpl implements ReportService {
             map.put("valueOne", sdf.format(new Date()));
             map.put("url", reportDTO.getPayImg());
             map.put("templateId", "3NM7ujI5vuJSdYlHJAPcYiacrg2YvuyT1Y7BZf9qeNc");
-            map.put("userId", 21);
+            map.put("userId", userId);
             map.put("header", "您有新的收款，请及时查收");
             map.put("remark", "点击查看凭证");
             sendUtils.sendMessageForPay(map);

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/trade/TradeServiceImpl.java

@@ -544,7 +544,7 @@ public class TradeServiceImpl implements TradeService {
             saleReportDO.setNetWeight(flatTotal);
             saleReportDO.setUnitPrice(flatPrice);
             saleReportDO.setBasis(flatBasis);
-            saleReportDO.setUnitPrice1(CalculationUtil.subToFloat(flatPrice,tradeDO.getUnitPrice()));
+            saleReportDO.setUnitPrice1(CalculationUtil.addToFloat(CalculationUtil.subToFloat(flatPrice,tradeDO.getUnitPrice()),flatBasis));
             saleReportDO.setPayMoney(CalculationUtil.mulToFloat(CalculationUtil.addToFloat(CalculationUtil.subToFloat(flatPrice,tradeDO.getUnitPrice()),flatBasis), flatTotal));
             saleReportDO.setNotPayMoney(saleReportDO.getPayMoney());
             saleReportDO.setPayStatus("未付款");
@@ -567,7 +567,7 @@ public class TradeServiceImpl implements TradeService {
             map.put("page", "/pageB/contract/contract");
             map.put("templateId", "8t4RKKFczLf16eeaaZK489u7BNuQXKwXEC6kQAN4xDU");
             map.put("userId", tradeDO.getUserId());
-            map.put("remark", "平仓数量："+tradeDO.getFlatTotal()+"请到小程序查看");
+            map.put("remark", "平仓数量："+flatTotal+"请到小程序查看");
             sendUtils.sendMessageForNotice(map);
         }
         else{
@@ -588,7 +588,7 @@ public class TradeServiceImpl implements TradeService {
             buyReportDO.setNetWeight(flatTotal);
             buyReportDO.setUnitPrice(flatPrice);
             buyReportDO.setBasis(flatBasis);
-            buyReportDO.setUnitPrice1(CalculationUtil.subToFloat(tradeDO.getUnitPrice(),flatPrice));
+            buyReportDO.setUnitPrice1(CalculationUtil.addToFloat(CalculationUtil.subToFloat(tradeDO.getUnitPrice(),flatPrice),flatBasis));
             buyReportDO.setMoney(CalculationUtil.mulToFloat(CalculationUtil.addToFloat(CalculationUtil.subToFloat(tradeDO.getUnitPrice(),flatPrice),flatBasis), flatTotal));
             buyReportDO.setNotMoney(buyReportDO.getMoney());
             buyReportDO.setPayStatus("未付款");
@@ -611,7 +611,7 @@ public class TradeServiceImpl implements TradeService {
             map.put("page", "/pageB/contract/contract");
             map.put("templateId", "8t4RKKFczLf16eeaaZK489u7BNuQXKwXEC6kQAN4xDU");
             map.put("userId", tradeDO.getUserId());
-            map.put("remark", "平仓数量："+tradeDO.getFlatTotal()+"请到小程序查看");
+            map.put("remark", "平仓数量："+flatTotal+"请到小程序查看");
             sendUtils.sendMessageForNotice(map);
         }
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -55,6 +55,8 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Autowired
     private CollectMapper collectMapper;
+    @Autowired
+    private MessageMapper messageMapper;
 
     @Autowired
     DataSourceTransactionManager dataSourceTransactionManager;
@@ -269,15 +271,12 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Override
     public void test() throws Exception {
-        Map<String, Object> map = new HashMap<>();
-        map.put("value", "220元");
-        map.put("valueOne", "2021年5月14日");
-        map.put("url", "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/5dc2099ab5554334ba49934259f850c6.png");
-        map.put("templateId", "3NM7ujI5vuJSdYlHJAPcYiacrg2YvuyT1Y7BZf9qeNc");
-        map.put("userId", 21);
-        map.put("header", "您有新的收款，请及时查收");
-        map.put("remark", "点击查看凭证");
-        sendUtils.sendMessageForPay(map);
+        MessageDO messageDO = new MessageDO();
+        messageDO.setResult("请及时审核");
+        messageDO.setPath("/sale/trade");
+        messageDO.setCompanyId(2l);
+        messageMapper.insert(messageDO);
+        webSocket.sendMessageByRole(messageDO, "内勤", 2l);
     }
 
 

unimall-admin/src/global.js

@@ -55,8 +55,14 @@ export default {
       })
       // console.log(router)
       var currentPage = router.history.current.path
+      console.log(currentPage, 'currentPage')
       router.push({ path: '/' })
-      router.push({ path: currentPage })
+      console.log('执行成功1')
+      router.push({ path: currentPage,
+        query: {
+          params: Date()
+        }})
+      console.log('执行成功')
     }
     // 连接关闭的回调
     this.websocket.onclose = evt => {

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/task/TaskAppServiceImpl.java

@@ -938,6 +938,7 @@ public class TaskAppServiceImpl implements TaskAppService{
                             wrapper2.eq("task_status", TaskStatusType.STATUS1.getCode());
                             wrapper2.eq("task_type", "付款审核任务");
                             wrapper2.eq("order_no", taskDO.getOrderNo());
+                            wrapper2.eq("report_id", taskDO.getReportId());
                             List<TaskDO> list = taskMapper.selectList(wrapper2);
                             for (TaskDO tmp : list) {
                                 tmp.setTaskStatus(TaskStatusType.STATUS2.getCode());
@@ -988,6 +989,7 @@ public class TaskAppServiceImpl implements TaskAppService{
                             wrapper2.eq("task_status", TaskStatusType.STATUS1.getCode());
                             wrapper2.eq("task_type", "付款审核任务");
                             wrapper2.eq("order_no", taskDO.getOrderNo());
+                            wrapper2.eq("report_id", taskDO.getReportId());
                             BuyReportDO buyReportDO1=buyReportMapper.selectById(taskDO.getReportId());
                             if (buyReportDO1.getBuy()==null||buyReportDO1.getBuy()==0){
                                 wrapper2.eq("car_no", taskDO.getCarNo());
@@ -1065,6 +1067,7 @@ public class TaskAppServiceImpl implements TaskAppService{
                             wrapper.eq("task_status", TaskStatusType.STATUS1.getCode());
                             wrapper.eq("task_type", "付款审核任务");
                             wrapper.eq("order_no", taskDO.getOrderNo());
+                            wrapper.eq("report_id", taskDO.getReportId());
                             List<TaskDO> list = taskMapper.selectList(wrapper);
                             for (TaskDO tmp : list) {
                                 tmp.setTaskStatus(TaskStatusType.STATUS2.getCode());
@@ -1080,6 +1083,7 @@ public class TaskAppServiceImpl implements TaskAppService{
                             wrapper.eq("task_type", "付款审核任务");
                             wrapper.eq("order_no", taskDO.getOrderNo());
                             wrapper.eq("car_no", taskDO.getCarNo());
+                            wrapper.eq("report_id", taskDO.getReportId());
                             List<TaskDO> list = taskMapper.selectList(wrapper);
                             for (TaskDO tmp : list) {
                                 tmp.setTaskStatus(TaskStatusType.STATUS2.getCode());

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/tradeContract/TradeContractServiceImpl.java

@@ -131,7 +131,7 @@ public class TradeContractServiceImpl implements TradeContractService {
             Map<String, Object> map = new HashMap<>();
             map.put("value",taskDO.getCarNo());
             map.put("valueOne","入库任务");
-            map.put("page","/pageB/contract/contract");
+            map.put("page","pages/user/task");
             map.put("templateId","4VAjIhIi3y1HUp_n_t2YXB7TLc328yVr5neAiq8Inrk");
             map.put("userId",storeUserDO.getUserId());
             map.put("header", "工作提醒");

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/tran/TranAppServiceImpl.java

@@ -423,11 +423,11 @@ public class TranAppServiceImpl implements TranAppService{
                 Map<String, Object> map = new HashMap<>();
                 map.put("value",taskDO.getCarNo());
                 map.put("valueOne",storeMapper.selectById(taskDO.getStoreId()).getName());
-                map.put("page","pages/user/task");
+                map.put("page","pageB/contract/contract");
                 map.put("templateId","T6EwpfrZ9KkKjriCZVRqOYIJjQFYkoWwAGSalX9Ky_c");
                 map.put("userId",userId);
                 map.put("header", "您好，您的车辆申请卸货，请及时确认！");
-                map.put("remark","点击进入小程序完成任务");
+                map.put("remark","点击进入小程序确认卸货");
                 sendUtils.sendMessageForDeliver(map);
             }
             carDO.setCheckType(1);

unimall-app/components/addressBook.vue

@@ -3,14 +3,14 @@
 		<u-index-list :scrollTop="scrollTop" :index-list="indexList" :active-color="'#3CC51F'">
 			<view v-if="isShowMenu">
 				<u-index-anchor index="#" />
-				<view class="list-cell" hover-class="message-hover-class" @tap="linkToNewFriend">
+				<!-- <view class="list-cell" hover-class="message-hover-class" @tap="linkToNewFriend">
 					<u-image width="70rpx" height="70rpx" src="/static/image/friend_1.png"></u-image>
 					<view class="list-cell-name">新的粮友</view>
 				</view>
 				<view class="list-cell " hover-class="message-hover-class"  @tap="linkToGroupItem">
 					<u-image width="70rpx" height="70rpx" src="/static/image/group_1.png"></u-image>
 					<view  class="list-cell-name">我的群聊</view>
-				</view>
+				</view> -->
 			</view>
 			<view v-if="isSearch">
 				<u-index-anchor index="#" />
@@ -82,8 +82,8 @@
 			return {
 				tList: this.list,
 				keyword:'',
-				url1:require('@/static/image/friend_1.png'),
-				url2:require('@/static/image/group_1.png'),
+				// url1:require('@/static/image/friend_1.png'),
+				// url2:require('@/static/image/group_1.png'),
 				$url:'',
 				indexList: ['#', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
 			};

unimall-app/components/chat/im-drawer.vue

@@ -6,7 +6,7 @@
 			<emotion @addEmoji="addEmoji" @send="sendMsg(0,textMsg)" :class="{hidden:hideEmoji}"></emotion>
 			<!-- 更多功能 相册-拍照-红包 -->
 			<view class="more-layer" :class="{hidden:hideMore}">
-				<view class="list">
+				<!-- <view class="list">
 					<view class="box" @tap="chooseImage">
 						<image class="box-xx" src="../../static/img/more/tupian.png"></image>
 					</view>
@@ -16,7 +16,7 @@
 					<view class="box" @tap="redShow">
 						<image class="box-xx" src="../../static/img/more/hongbao.png"></image>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 	</view>

unimall-app/components/chat/left-bubble.vue

@@ -38,7 +38,7 @@
 					<div class="message-red-packet-left" :style="redProcess(row.msgContext).surplusMoney===0?'background:#F7DFC3':'background:#F09D47'">
 						<div class="text">
 						   <span class="packet">恭喜发财,大吉大利</span>
-						   <image :src="redProcess(row.msgContext).surplusMoney===0?'../../static/img/red-chai.png':'../../static/img/red.png'"></image>
+						   <!-- <image :src="redProcess(row.msgContext).surplusMoney===0?'../../static/img/red-chai.png':'../../static/img/red.png'"></image> -->
 						</div>
 						<div :class="redProcess(row.msgContext).surplusMoney===0?'footer2':'footer'">红包</div>
 						<div class="arrow-org" :style="redProcess(row.msgContext).surplusMoney===0?'background:#F7DFC3':'background:#F09D47'"></div>

unimall-app/components/chat/right-bubble.vue

@@ -30,7 +30,7 @@
 				<view v-if="row.msgType==7" @tap="openRedPacket(row)">
 					<div class="message-red-packet-right" :style="redProcess(row.msgContext).surplusMoney===0?'background:#F7DFC3':'background:#F09D47'">
 						<div class="text">
-						  <image :src="redProcess(row.msgContext).surplusMoney===0?'../../static/img/red-chai.png':'../../static/img/red.png'"></image>
+						  <!-- <image :src="redProcess(row.msgContext).surplusMoney===0?'../../static/img/red-chai.png':'../../static/img/red.png'"></image> -->
 						  <span class="packet">恭喜发财，大吉大利</span>
 						</div>
 						<div :class="redProcess(row.msgContext).surplusMoney===0?'footer2':'footer'">红包</div>

unimall-app/components/drag-button/drag-button.vue

@@ -10,8 +10,8 @@
 			@click.stop.prevent="click"
 			:class="{transition: isDock && !isMove }"
 		>
-		<image v-if='isIcon' class='side-bg' src='../../static/side-bg.png'></image>
-		<view style='position: relative;z-index:2;text-align:center;' :class="icon"><view><image style='width:11px;height:11px;' src="../../static/add.png" mode=""></image></view>{{text}}</view> 
+		<image v-if='isIcon' class='side-bg' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/side-bg.png'></image>
+		<view style='position: relative;z-index:2;text-align:center;' :class="icon"><view><image style='width:11px;height:11px;' src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/add.png" mode=""></image></view>{{text}}</view> 
 		</view>
 	</view>
 </template>

unimall-app/components/swiperup.vue

@@ -8,8 +8,8 @@
 	    <swiper-item>
 			<view class="itme_text">
 				<view>
-					<image class='gb' src='../static/gb.png'></image>
-					<image class='horn' src='../static/horn.png'></image>{{item.port}}{{item.goodsName}}&nbsp;&nbsp;({{item.newOld}})&nbsp;&nbsp;{{item.price}}元/吨
+					<image class='gb' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/gb.png'></image>
+					<image class='horn' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/horn.png'></image>{{item.port}}{{item.goodsName}}&nbsp;&nbsp;({{item.newOld}})&nbsp;&nbsp;{{item.price}}元/吨
 				</view>
 			</view>
 	    </swiper-item>

unimall-app/components/upload.vue

@@ -497,8 +497,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../static/css/style.components.scss';
+// nvue不能用标签命名样式
+/* #ifndef APP-NVUE */
+image {
+	display: inline-block;
+	// 解决图片加载时可能会瞬间变形的问题
+	will-change: transform;
+}
 
+view,
+text {
+	box-sizing: border-box;
+	flex-direction: row;
+}
+/* #endif */
 .u-upload {
 	display: flex;
 	flex-wrap: wrap;

unimall-app/config/index.js

@@ -2,11 +2,11 @@ const dev = {
 	// baseUrl: 'http://127.0.0.1:8080',
 	// baseUrl: 'http://192.168.1.109:8080',
 	// baseUrl: 'http://192.168.1.115:8080',
-	baseUrl: 'http://192.168.1.124:8080',
+	// baseUrl: 'http://192.168.1.124:8080',
 	// baseUrl: 'http://192.168.1.113:8080',
 	// baseUrl: 'http://192.168.8.188:8081',
 	// baseUrl: 'https://www.zhuqt.icu',
-	// baseUrl: 'https://www.zthymaoyi.com',
+	baseUrl: 'https://www.zthymaoyi.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

unimall-app/pageA/pages/deliver_goods.vue

@@ -44,7 +44,7 @@
 			当前合同暂无车辆
 		</view>
 		<drag-button 
-			v-if="contractType =='销售合同'&& tradeStatus!="4""
+			v-if="contractType =='销售合同'&& tradeStatus!='4'"
 			:isDock="true"
 			:existTabBar="true"
 			text="发货"
@@ -53,7 +53,7 @@
 			boxshadow="0 0 6rpx rgba(36, 90, 141, 0.5)"
 			@btnClick="deliver"
 			/>
-			<block v-if='tradeStatus!="3" && tradeStatus!="4"'>
+			<block v-if="tradeStatus!='3' && tradeStatus!='4'">
 			<drag-button
 				:isDock="true"
 				:existTabBar="true"

unimall-app/pageC/chat/groupDetail.vue

@@ -74,7 +74,7 @@ export default {
 	},
 	data() {
 		return {
-			src1: require('@/static/qrcode.png'),
+			src1: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/qr_code.png',
 			chatId: '',
 			chatName: '',
 			members: [],

unimall-app/pageC/my/account.vue

@@ -25,7 +25,7 @@
 		data() {
 			return {
 				src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
-				src1:require('@/static/qrcode.png'),
+				src1:'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/qr_code.png',
 				groupList: [
 					{ title: '新消息通知', color: '#409eff', icon: 'star' },
 					{ title: '隐私', color: '#409eff', icon: 'photo' },

unimall-app/pageC/my/common.vue

@@ -28,7 +28,7 @@
 		data() {
 			return {
 				src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
-				src1:require('@/static/qrcode.png'),
+				src1: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/qr_code.png',
 				groupList: [
 					{ title: '新消息通知', color: '#409eff', icon: 'star' },
 					{ title: '隐私', color: '#409eff', icon: 'photo' },

unimall-app/pageC/my/person.vue

@@ -29,7 +29,7 @@
 	export default {
 		data() {
 			return {
-				src1:require('@/static/qrcode.png'),
+				src1:'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/qr_code.png',
 				action:this.$uploadUrl,
 				filesArr: [],
 				groupList: [

unimall-app/pages.json

@@ -91,17 +91,6 @@
 				} 
 			}
 		}, 
-		{
-			"path": "pages/public/reset",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": false,
-					"animationType": "slide-in-bottom"
-				}
-			}
-		}, 
 		{
 			"path": "pages/public/register",
 			"style": {

unimall-app/pages/buy/transaction.vue

@@ -52,10 +52,10 @@
 		 :iconStyle="{color: '#2979ff',fontSize: '34rpx'}" mode="square"icon="arrow-up" ></u-back-top>
 		<view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
-				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'../../static/zixun_check.png':'../../static/zixun.png'"></image></view> 资讯
+				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
 			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'../../static/jiaoyi_check.png':'../../static/jiaoyi.png'"></image></view>交易
+				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
 			</view>
 			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
 			 data-cur="trust">
@@ -65,15 +65,14 @@
 				粮信
 			</view>
 			<view v-if="showTran" :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
-				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'../../static/wuliu_check.png':'../../static/wuliu.png'"></image></view> 物流
+				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png'"></image></view> 物流
 			</view>
 			<view :class="PageCur=='my'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="my">
 				<view>
 				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'../../static/wode_check.png':'../../static/wode.png'"></image>
+				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
 				</view>
 				 我的
-				
 			</view>
 		</view>
 		<drag-button

unimall-app/pages/public/login.vue

@@ -46,7 +46,7 @@
 				</view>
 				<view style='    position: fixed;bottom: 9px;width: 100%;text-align-last: center;'>
 					<text  @click="wechatLogin" class="cuIcon-weixin"></text>
-					<image class='apple' src="@/static/apple.png" @click="appleLogin" alt=""></image>
+					<image class='apple' src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/apple.png" @click="appleLogin" alt=""></image>
 				</view>
 			</block>
 			<!-- #endif -->

unimall-app/pages/public/reset.vue

@@ -1,253 +0,0 @@
-<template>
-	<view class="container">
-		<view class="wrapper">
-			<view class="left-top-sign">LOGIN</view>
-			<view class="welcome">
-				欢迎回来！
-			</view>
-			<!-- v-if="loginType === 'phone'" -->
-			<view  class="input-content">
-				<view class="cu-form-group">
-					<view class="title"><text class="cuIcon-my"></text></view>
-					<input placeholder="请输入手机号" v-model="phone" name="input" ></input>
-				</view>
-				<view class="cu-form-group">
-					<view class="title"><text class="cuIcon-my"></text></view>
-					<input placeholder="请输入新密码" password v-model="password" name="input" ></input>
-				</view>
-				<!-- <view class="input-item">
-					<text class="tit">验证码</text>
-					<view class="verify-code">
-						<input type="mobile" value="" placeholder="6位验证码" maxlength="6"
-						 data-key="verifyCode" @input="inputChange" style="width: 60%;" />
-						<button class="cu-btn bg-green shadow" :disabled="sendDisabled" @click="doGetVerify">{{sendText}}</button>
-					</view>
-				</view> -->
-				<view class="cu-form-group">
-					<view class="title">验证码</view>
-					<input type="mobile" value="" placeholder="6位验证码" maxlength="6"
-						 data-key="verifyCode" @input="inputChange" style="width: 60%;"></input>
-					<button class='cu-btn bg-green shadow':disabled="sendDisabled" @click="doGetVerify">{{sendText}}</button>
-				</view>
-				<button style='width:100%;' @click='reset' class="cu-btn bg-gradual-green">重置密码</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-			data() {
-				return {
-					verifyCode:'',
-					sendText:'获取验证码',
-					sendDisabled: false,
-					phone:'',
-					password:''
-				}
-			},
-			computed: {
-			},
-			onShow() {
-			},
-			onLoad() {
-			},
-			onReady(){
-				
-			},
-			methods: {
-				inputChange(e) {
-					const key = e.currentTarget.dataset.key;
-					this[key] = e.detail.value;
-				},
-				reset(){
-					var that=this
-					if (!this.phone || this.phone.length != 11) {
-						uni.showToast({
-							title:'请输入正确手机号！',
-							icon:'none'
-						})
-						return
-					}
-					if (!this.password) {
-						uni.showToast({
-							title:'请输入密码！',
-							icon:'none'
-						})
-						return
-					}
-					if (!this.verifyCode) {
-						uni.showToast({
-							title:'请输入验证码！',
-							icon:'none'
-						})
-						return
-					}
-					uni.showLoading({
-						title: '加载中'
-					})
-					this.$api.request('user', 'resetPassword',{
-						password:that.password,
-						phone:that.phone,
-						verifyCode:that.verifyCode
-					}, failres => {
-				           that.$api.msg(failres.errmsg)
-				           uni.hideLoading()
-				    }).then(res => {
-						uni.hideLoading()
-						uni.navigateBack()
-					})
-				},
-				verifyCodeInput(e){
-					this.verifyCode = e.detail.value
-				},
-				doGetVerify() {
-					const that = this
-					var phone = this.phone;
-					if (!phone || phone.length != 11) {
-						uni.showToast({
-							title:'请输入正确手机号！',
-							icon:'none'
-						})
-						return
-					}
-					that.$api.request('user', 'sendVerifyCode', {
-						phone: phone,
-					}).then(res => {
-						that.sendDisabled = true
-						let sec = 60
-						let interval = setInterval(() => {
-							sec--;
-							that.sendText = sec + 's后重发'
-							if (sec <= 0) {
-								that.sendDisabled = false
-								that.sendText = "获取验证码"
-								clearInterval(interval)
-							}
-							
-						}, 1000)
-					})
-				},
-			},
-		}
-	
-</script>
-
-<style lang='scss' scoped>
-	page {
-		background: #fff;
-	}
-	.container {
-		padding-top: 115px;
-		position: relative;
-		width: 100vw;
-		height: 100vh;
-		overflow: hidden;
-		background: #fff;
-	}
-	
-	.wrapper {
-		position: relative;
-		z-index: 90;
-		background: #fff;
-		padding-bottom: 40upx;
-		height:100%;
-	}
-	
-	
-	.left-top-sign {
-		font-size: 120upx;
-		color: $page-color-base;
-		position: relative;
-		left: -16upx;
-	}
-	
-	.left-bottom-sign {
-		position: absolute;
-		left: -270upx;
-		bottom: -320upx;
-		border: 100upx solid #d0d1fd;
-		border-radius: 50%;
-		padding: 180upx;
-	}
-	
-	.welcome {
-		position: relative;
-		left: 50upx;
-		top: -90upx;
-		font-size: 46upx;
-		color: #555;
-		text-shadow: 1px 0px 1px rgba(0, 0, 0, .3);
-	}
-	
-	.input-content {
-		padding: 0 60upx;
-	}
-	
-	.input-item {
-		display: flex;
-		flex-direction: column;
-		align-items: flex-start;
-		justify-content: center;
-		padding: 0 30upx;
-		background: $page-color-light;
-		height: 120upx;
-		border-radius: 4px;
-		margin-bottom: 50upx;
-	
-		&:last-child {
-			margin-bottom: 0;
-		}
-	
-		.tit {
-			height: 50upx;
-			line-height: 56upx;
-			font-size: $font-sm+2upx;
-			color: $font-color-base;
-		}
-	
-		input {
-			height: 60upx;
-			font-size: $font-base + 2upx;
-			color: $font-color-dark;
-			width: 100%;
-		}
-	}
-	
-	.confirm-btn {
-		width: 630upx;
-		height: 76upx;
-		line-height: 76upx;
-		border-radius: 50px;
-		margin-top: 70upx;
-		background: $uni-color-primary;
-		color: #fff;
-		font-size: $font-lg;
-	
-		&:after {
-			border-radius: 100px;
-		}
-	}
-	
-	.forget-section {
-		font-size: $font-sm+2upx;
-		color: $font-color-spec;
-		text-align: center;
-		margin-top: 40upx;
-	}
-	
-	.register-section {
-		position: absolute;
-		left: 0;
-		bottom: 50upx;
-		width: 100%;
-		font-size: $font-sm+2upx;
-		color: $font-color-base;
-		text-align: center;
-	
-		text {
-			color: $font-color-spec;
-			margin-left: 10upx;
-		}
-	}
-</style>

unimall-app/pages/sale/information.vue

@@ -26,7 +26,7 @@
 		<scroll-view style='margin-top:12px;padding:0 20px;' scroll-x class="nav">
 			<view class="flex text-center">
 				<view style='position:relative;' class="cu-item flex-sub" :class="item.value==TabCur?'text-white':''" v-for="item in categoryList"@tap="tabSelect" :data-id="item.value">
-					<image v-if='item.value==TabCur' style='width:100%;height:100%;position: absolute;z-index:1;left:0;' src='../../static/bg.png'></image>
+					<image v-if='item.value==TabCur' style='width:100%;height:100%;position: absolute;z-index:1;left:0;' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/bg.png'></image>
 					<text style='position:relative;z-index:2;'>{{item.label}}</text>
 				</view>
 			</view>
@@ -50,8 +50,8 @@
 							<view class='wrap'>{{item.city}} {{item.factoryType}}</view>
 							</view>
 						<view style='flex:1;' class='price'>{{item.price}}</view>
-						<view style='flex:1;' class='positive' v-if='item.comparePrice>0'>{{item.comparePrice}}<image class='up' src='../../static/up.png'></image></view>
-						<view style='flex:1;' class='negative' v-if='item.comparePrice<0'>{{-item.comparePrice}}<image class='down' src='../../static/decline.png'></image></view>
+						<view style='flex:1;' class='positive' v-if='item.comparePrice>0'>{{item.comparePrice}}<image class='up' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/up.png'></image></view>
+						<view style='flex:1;' class='negative' v-if='item.comparePrice<0'>{{-item.comparePrice}}<image class='down' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/decline.png'></image></view>
 						<view style='flex:1;font-weight:900;' v-if='item.comparePrice==0'>-</view>
 					</view>
 				</view>
@@ -83,8 +83,8 @@
 							<text class="cu-tag radius line-blue text-bluk">{{item.bulkDensity}}</text>
 						</view>
 						</view>
-					<view style='flex:1;' class='positive' v-if='item.comparePrice>0'>{{item.comparePrice}}<image class='up' src='../../static/up.png'></image></view>
-					<view style='flex:1;' class='negative' v-if='item.comparePrice<0'>{{-item.comparePrice}}<image class='down' src='../../static/decline.png'></image></view>
+					<view style='flex:1;' class='positive' v-if='item.comparePrice>0'>{{item.comparePrice}}<image class='up' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/up.png'></image></view>
+					<view style='flex:1;' class='negative' v-if='item.comparePrice<0'>{{-item.comparePrice}}<image class='down' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/decline.png'></image></view>
 					<view style='flex:1;font-weight:900;' v-if='item.comparePrice==0'>-</view>
 				</view>
 			</view>
@@ -132,16 +132,16 @@
 			</view>
 			
 		</view>
-		<view v-if='scrollTop>100' class='goTop'><image src='../../static/top.png'  @click="goTop"></image></view>
+		<!-- <view v-if='scrollTop>100' class='goTop'><image src='../../static/top.png'  @click="goTop"></image></view> -->
 		
 		<!-- <u-back-top :scroll-top="scrollTop" tips="顶部" :custom-style="{backgroundColor: '#a0cfff',color: '#2979ff'}"
 		 :iconStyle="{color: '#2979ff',fontSize: '34rpx'}" mode="square"icon="arrow-up" ></u-back-top> -->
 		<view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
-				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'../../static/zixun_check.png':'../../static/zixun.png'"></image></view> 资讯
+				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
 			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'../../static/jiaoyi_check.png':'../../static/jiaoyi.png'"></image></view>交易
+				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
 			</view>
 			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
 			 data-cur="trust">
@@ -151,15 +151,14 @@
 				粮信
 			</view>
 			<view v-if="showTran" :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
-				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'../../static/wuliu_check.png':'../../static/wuliu.png'"></image></view> 物流
+				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png'"></image></view> 物流
 			</view>
 			<view :class="PageCur=='my'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="my">
 				<view>
 				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'../../static/wode_check.png':'../../static/wode.png'"></image>
+				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
 				</view>
 				 我的
-				
 			</view>
 		</view>
 	</view>

unimall-app/pages/tran/tran.vue

@@ -29,7 +29,7 @@
 							>
 							<view style='margin:5px 0;diaplay:inline-block;font-weight:900;' class="flex justify-between">
 								<text>{{item.startPlace }}</text>
-								<image class='carIcon' src='../../static/car.png'></image>
+								<image class='carIcon' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/car.png'></image>
 								<text>{{item.endPlace }}</text>
 							</view>
 							<view style='margin:5px 0;diaplay:inline-block;' class="flex justify-between">
@@ -99,10 +99,10 @@
 	
 		<view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
-				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'../../static/zixun_check.png':'../../static/zixun.png'"></image></view> 资讯
+				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
 			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'../../static/jiaoyi_check.png':'../../static/jiaoyi.png'"></image></view>交易
+				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
 			</view>
 			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
 			 data-cur="trust">
@@ -111,13 +111,13 @@
 				</button>
 				粮信
 			</view>
-			<view :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
-				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'../../static/wuliu_check.png':'../../static/wuliu.png'"></image></view> 物流
+			<view  :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
+				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png'"></image></view> 物流
 			</view>
 			<view :class="PageCur=='my'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="my">
 				<view>
 				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'../../static/wode_check.png':'../../static/wode.png'"></image>
+				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
 				</view>
 				 我的
 			</view>

unimall-app/pages/user/user.vue

@@ -79,28 +79,27 @@
 		</neil-modal>
 		<view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
-				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'../../static/zixun_check.png':'../../static/zixun.png'"></image></view> 资讯
+				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
 			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'../../static/jiaoyi_check.png':'../../static/jiaoyi.png'"></image></view>交易
+				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
 			</view>
 			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
 			 data-cur="trust">
 				<button :class="PageCur=='trust'?'cuIcon-group':'cu-btn cuIcon-group bg-white '">
-					<view v-if="liangxinTip" class="badge">{{liangxinTip}}</view>
+					<view v-if="liangxinTip" class="cu-tag badge">{{liangxinTip}}</view>
 				</button>
 				粮信
 			</view>
 			<view v-if="showTran" :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
-				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'../../static/wuliu_check.png':'../../static/wuliu.png'"></image></view> 物流
+				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png'"></image></view> 物流
 			</view>
 			<view :class="PageCur=='my'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="my">
 				<view>
 				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'../../static/wode_check.png':'../../static/wode.png'"></image>
+				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
 				</view>
 				 我的
-				
 			</view>
 		</view>
 		<!-- <drag-button

unimall-app/static/css/style.components.scss

@@ -1,14 +0,0 @@
-// nvue不能用标签命名样式
-/* #ifndef APP-NVUE */
-image {
-	display: inline-block;
-	// 解决图片加载时可能会瞬间变形的问题
-	will-change: transform;
-}
-
-view,
-text {
-	box-sizing: border-box;
-	flex-direction: row;
-}
-/* #endif */

unimall-app/static/css/vue-emoji.css

@@ -1,99 +0,0 @@
-*{
-		padding: 0px;
-		margin: 0px;
-	 }
-			
-	.container{
-		position: relative;
-		overflow: hidden;
-		width: 100%;
-		background-color: #F6F7F8;
-	}
-
-	.emojiList{
-		height: 260px;
-		padding: 5px;
-		list-style: none;
-		overflow: hidden;
-	}
-	.emojiList::after{
-		/* content: ""; */
-		/* display: block; */
-		/* clear: both; */
-	}
-
-	.item{
-		width: 360px;
-		height: 184px;
-		overflow: hidden;
-		float: left;
-	}
-
-	.item img{
-		width: 48px;
-		height: 48px;
-		left: 20px;
-		/* display: block; */
-	} 
-
-	.point{
-		position: absolute;
-		list-style: none;
-		left: 50%;
-		/* 在x负轴上移动 50% */
-		transform: translateX(-50%);
-		bottom: 60px;
-	}
-
-	.point-item{
-		float: left;
-		width: 8px;
-		height: 8px;
-		margin: 0px 5px;
-		background-color: black; /* white */
-		opacity: .2;
-		border-radius: 100px;
-	}
-
-	/* 激活指示器 */
-	.point-item.active {
-		opacity: 1;
-	}
-	
-	/* 小表情样式 */
-	.emojiImg.minImg {
-		width: 32px;
-		height:32px; 
-		float: left; 
-		margin-left: 16px; 
-		margin-top: 16px; 
-	}
-	/* 大表情样式 */ 
-	.emojiImg.bigImg {
-		width: 64px;
-		height:64px;  
-		float: left; 
-		margin-left: 20px;  
-		margin-top: 14px;
-	}
-	
-	
-	.toast {
-		position: fixed;
-		z-index: 2000;
-		left: 50%;
-		top:50%;
-		transition:all .5s;
-		-webkit-transform: translateX(-50%) translateY(-50%);
-		   -moz-transform: translateX(-50%) translateY(-50%);
-			-ms-transform: translateX(-50%) translateY(-50%);
-			 -o-transform: translateX(-50%) translateY(-50%);
-				transform: translateX(-50%) translateY(-50%);
-		text-align: center;
-		border-radius: 5px;
-		color:#FFF;
-		background: rgba(17, 17, 17, 0.7);
-		height: 120px;
-		line-height: 45px;
-		padding: 0 15px;
-	}

unimall-app/static/iconfont/iconfont.css

@@ -1,41 +0,0 @@
-@font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1591263520076'); /* IE9 */
-  src: url('iconfont.eot?t=1591263520076#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAScAAsAAAAACcAAAARPAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDXgqGDIUnATYCJAMcCxAABCAFhG0HZBuDCMgehXEsLKRQqayMNzwevt/v92ufq7gm0QjZp4uGhIcOiQqhWSqUptP1a2jvp/esN5msikN7Qlb0ScUk1y1SLZw9k8X5i/69lvj5zx9LvmsMoHz27VzuXUYsS6N4QAPqpkjggexAFjYx3TB2eZG3E2g2LgzaKCgbBp5y+n6BuNBwCvBM2OUV3FCbyoJTc4hbcFOn2dQ9ADde7+MXxIQnSIoM9DttHuWrIevD69NtLLgE4zIBhOG8YGeRYQHIietC/xXgIL8Aa5b/Jm0XaFdLyg+v9wHvU9//PuPTbZeL5Eh9ZWg3/KRB/+HlSgVRAtK3QsZhoeTDyyIkPgIIGR+phODjNyHncwah5Pu2XaHQqlPaMQj8AMQyYPPiVNoC14ZMFl4GZ6AE6ZCdkboPkkjMnkk50erdc/d27Zmza3jw4VoviEQj1jwIkGy712+YaI7Nm9pkF3ef6/TBW9UOxwinc6TdPtxmG4av2ZjN9vybTt8tjoKxImH/6blnD6INF+acU4jWn597cWjXgTNzTu1TFCoSh44ltSxXYxGhrhVzlgE023xhuVgM/LkrERJL87Rj+sXecYyVDkfTVNrW5rgwGeTtEnbjUmUQZ5yZNNfpdOhVNhtjt5MCbIMDYIO6zM4ovCfImPe7PLwfpKV2Em/sn7tTvojahFcOyjXHl5XS13FZWfwtcgj97u1oqqkRjUGjm5pG2xpEEW42pqlxNKW8VFUplVjsy5fZEul1LkHn5fC+I2aEzRjRF7uKXE99h7sGnHba+hTrI5zfCd86GxrOJScnJJyFZcsEweus7KwX7li//Bj98yd9zJAitNVRh7g2YAt+9gxDzRaMUI23gqQkhIbKGv1mylxek18jfeZLNPo1vbfFDUsKnCRXFpeo5JOCEmtpVDhxUtFeWZOM6ti5swNxqF07G2SzZNBBf7X0Hx0CaLzE77EfANkzcgCQHqm/oGHHe3EoAJ7R48f7GoN3/WdN7J72z1NMA7z/x8B4w05D80ItwRS/maLhjFxR6Y4ql8a3BgpUlvw+2YRmI0wDhru9Gc7Y1zhLqBMKBkllDDK1CUrOWIBCi0Uo1Zah2bzCs1v0MMMi9wLmTAcQOh2EpN0TZDrdp+SM11Do9w1KnYGh2X7IL9liKjSiXDNRWImaUTYzGhVvYE2XVeS31hCuXqcwx1UefwQxWzQpJjoiKl0qJAZiHuIISwMXY7WyDGvm9UwBuBvR6XjGaObriMoaMdlqNaZERrJF7xSh4vUgss6MULAi1BhKzRgaKjwD1lnbSpT5/BoEp56OgrliTFlyBMLMQrNxRrQIUQ0ohXpDozGXsrVFA04MKysW78Uy4+kxCqCX0Bl5HsNYvFMdQsUqwuQOWaMUkWgutqk+Ynqj/j6vg2b6a1dBIYxo5IbckQfyhOqYGDh1Pe/RpFEYuDoNFZ1MKxUqrTRbrTaQxp2tMvIWIjKeVx/eEK5QqwEAAA==') format('woff2'),
-  url('iconfont.woff?t=1591263520076') format('woff'),
-  url('iconfont.ttf?t=1591263520076') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1591263520076#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-gengduo:before {
-  content: "\e63b";
-}
-
-.icon-xiangji:before {
-  content: "\e609";
-}
-
-.icon-19:before {
-  content: "\e626";
-}
-
-.icon-back:before {
-  content: "\e6f2";
-}
-
-.icon-Addnewcompose:before {
-  content: "\e9c9";
-}
-
-.icon-person-add:before {
-  content: "\e786";
-}
-