Browse Source

feat:转移图片至阿里云oss

qianxinyu 4 months ago
parent
commit
c17064a183

+ 1 - 1
App.vue

@@ -22,7 +22,7 @@ export default {
       this.$http.request("api/custom/get_info").then((callback) => {
         this.getOn = true;
         if (callback.code == "success") {
-          if (!callback.data.userpic) callback.data.userpic = "../../static/icon/doctor.png";
+          if (!callback.data.userpic) callback.data.userpic = "https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/doctor.png";
           // 赋值
           this.userInfo = callback.data;
           // 存储登录标识

+ 12 - 2
pages/addr/index.vue

@@ -15,7 +15,10 @@
         <view class="contact_addr">{{ item.contact_province }} {{ item.contact_city }} {{ item.contact_area }} {{ item.contact_addr }}</view>
         <view class="contact_handler">
           <view class="radio_label" @click="setDefault(index)">
-            <image class="radio_icon" :src="item.is_default ? '../../static/icon/radioed.png' : '../../static/icon/radio.png'"></image>
+            <image
+              class="radio_icon"
+              :src="item.is_default ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'"
+            ></image>
             <text :class="item.is_default ? 'radioed_text' : ''">{{ item.is_default ? "已默认" : "设为默认" }}</text>
           </view>
           <view class="addr_right_btn" @click="removeAddr(index)">删除</view>
@@ -56,7 +59,14 @@
               <view class="terminalType_radio">
                 <view v-for="item in terminalType" :key="item.key">
                   <view style="display: flex; align-items: center" @click="handleRadioChange(item.key)">
-                    <image class="radio_icon" :src="item.key === addrRequest.shop_type ? '../../static/icon/radioed.png' : '../../static/icon/radio.png'"></image>
+                    <image
+                      class="radio_icon"
+                      :src="
+                        item.key === addrRequest.shop_type
+                          ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png'
+                          : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'
+                      "
+                    ></image>
                     &nbsp;<text style="font-size: 26rpx">{{ item.label }}</text>
                   </view>
                 </view>

+ 100 - 100
pages/bind/user.vue

@@ -1,107 +1,107 @@
 <template>
-	<view>
-		<view class="logo_box">
-			<image src="../../static/logo2.jpg" class="logo_image" ></image>
-		</view>
-		<button v-if="alloRequest" open-type="getPhoneNumber" @getphonenumber="getPhonenumber" class="get_phone">授权手机</button>
-		<view v-if="!alloRequest" class="alter_info">抱歉,传入的参数有误,请联系您的客服</view>
-	</view>
+  <view>
+    <view class="logo_box">
+      <image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/logo2.jpg" class="logo_image"></image>
+    </view>
+    <button v-if="alloRequest" open-type="getPhoneNumber" @getphonenumber="getPhonenumber" class="get_phone">授权手机</button>
+    <view v-if="!alloRequest" class="alter_info">抱歉,传入的参数有误,请联系您的客服</view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				requestParam:{
-					code:"",
-					kailin_uid:"",
-					work_userid:"",
-				},
-				alloRequest:false,
-			}
-		},
-		onLoad(param){
-			// 获取uid
-			this.requestParam.kailin_uid  	= param.kailin_uid;
-			// 跟进人员ID
-			this.requestParam.work_userid	= param.work_userid;
-		},
-		onShow(){
-			// 判断是否存在参数
-			if( this.requestParam.kailin_uid && this.requestParam.work_userid ) {
-				// 存在显示按钮
-				this.alloRequest = true;
-			}
-		},
-		methods: {
-			getPhonenumber(re){
-				// 如果授权失败的话
-				if( re.detail.errMsg != "getPhoneNumber:ok"){
-					uni.showToast({
-						icon:"error",
-						title:"授权失败"
-					})
-					return;
-				}
-				// 获取授权码
-				this.requestParam.code = re.detail.code
-				// 授权成功以后,调用登录
-				this.$http.request('api/work_bind/custom',this.requestParam,'post').then((re)=>{
-					// 成功的话
-					if( re.code == 'success' ){
-						// 存储登录标识
-						uni.setStorageSync('userLogin',re.data);
-						// 跳转到页面
-						uni.switchTab({url:"/pages/user/index"})
-					}else{
-						uni.showToast({
-							title: re.msg,
-							icon:"none"
-						})
-					}
-				});
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      requestParam: {
+        code: "",
+        kailin_uid: "",
+        work_userid: "",
+      },
+      alloRequest: false,
+    };
+  },
+  onLoad(param) {
+    // 获取uid
+    this.requestParam.kailin_uid = param.kailin_uid;
+    // 跟进人员ID
+    this.requestParam.work_userid = param.work_userid;
+  },
+  onShow() {
+    // 判断是否存在参数
+    if (this.requestParam.kailin_uid && this.requestParam.work_userid) {
+      // 存在显示按钮
+      this.alloRequest = true;
+    }
+  },
+  methods: {
+    getPhonenumber(re) {
+      // 如果授权失败的话
+      if (re.detail.errMsg != "getPhoneNumber:ok") {
+        uni.showToast({
+          icon: "error",
+          title: "授权失败",
+        });
+        return;
+      }
+      // 获取授权码
+      this.requestParam.code = re.detail.code;
+      // 授权成功以后,调用登录
+      this.$http.request("api/work_bind/custom", this.requestParam, "post").then((re) => {
+        // 成功的话
+        if (re.code == "success") {
+          // 存储登录标识
+          uni.setStorageSync("userLogin", re.data);
+          // 跳转到页面
+          uni.switchTab({ url: "/pages/user/index" });
+        } else {
+          uni.showToast({
+            title: re.msg,
+            icon: "none",
+          });
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	.logo_box{
-		display: block;
-		margin: 0rpx auto;
-		margin-top: 80rpx;
-		.logo_image{
-			width: 320rpx;
-			height: 320rpx;
-			display: block;
-			margin: 0rpx auto;
-		}
-	}
-	.get_phone{
-		display: block;
-		width: 180rpx;
-		height: 60rpx;
-		color: #FFFFFF;
-		font-size: 28rpx;
-		background: green;
-		margin: 0rpx auto;
-		line-height: 60rpx;
-		margin-top: 160rpx;
-		border-radius: 30rpx;
-		border: 0rpx solid #dddddd;
-	}
-	.get_phone::after{
-		border: 0rpx solid #dddddd;
-	}
-	.alter_info{
-		display: block;
-		color: #E03519;
-		font-size: 20rpx;
-		overflow: hidden;
-		margin: 20rpx auto;
-		background: #FFFFFF;
-		line-height: 40rpx;
-		padding: 35rpx 35rpx;
-		text-align: center;
-	}
-</style>
+.logo_box {
+  display: block;
+  margin: 0rpx auto;
+  margin-top: 80rpx;
+  .logo_image {
+    width: 320rpx;
+    height: 320rpx;
+    display: block;
+    margin: 0rpx auto;
+  }
+}
+.get_phone {
+  display: block;
+  width: 180rpx;
+  height: 60rpx;
+  color: #ffffff;
+  font-size: 28rpx;
+  background: green;
+  margin: 0rpx auto;
+  line-height: 60rpx;
+  margin-top: 160rpx;
+  border-radius: 30rpx;
+  border: 0rpx solid #dddddd;
+}
+.get_phone::after {
+  border: 0rpx solid #dddddd;
+}
+.alter_info {
+  display: block;
+  color: #e03519;
+  font-size: 20rpx;
+  overflow: hidden;
+  margin: 20rpx auto;
+  background: #ffffff;
+  line-height: 40rpx;
+  padding: 35rpx 35rpx;
+  text-align: center;
+}
+</style>

+ 23 - 6
pages/car/index.vue

@@ -3,7 +3,12 @@
     <view class="car_list">
       <view v-for="(pItem, pIndex) in cartListByGroup" :key="pIndex" style="margin-bottom: 20rpx">
         <view class="business_name" v-if="pItem.products.length !== 0">
-          <image @click="selectBussiness(pIndex)" class="checkbox" :src="pItem.checked ? '../../static/icon/checked.png' : '../../static/icon/checkbox.png'"></image>&nbsp;
+          <image
+            @click="selectBussiness(pIndex)"
+            class="checkbox"
+            :src="pItem.checked ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checked.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox.png'"
+          ></image
+          >&nbsp;
           {{ pItem.business_name }}
         </view>
         <view class="product_group">
@@ -11,8 +16,17 @@
             <SwipeAction @clickItem="clickItem" :index="index" ref="swipeAction" :pIndex="pIndex">
               <view class="car_item">
                 <view class="check_label" @click="checkedItem(pIndex, index, item.id)">
-                  <image class="checkbox" src="@/static/icon/checkbox_disabled.png" style="width: 30rpx; height: 30rpx" v-if="item.product_status !== 0 || item.stock == 0" />
-                  <image class="checkbox" :src="item.checked ? '../../static/icon/checked.png' : '../../static/icon/checkbox.png'" v-else></image>
+                  <image
+                    class="checkbox"
+                    src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox_disabled.png"
+                    style="width: 30rpx; height: 30rpx"
+                    v-if="item.product_status !== 0 || item.stock == 0"
+                  />
+                  <image
+                    class="checkbox"
+                    :src="item.checked ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checked.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox.png'"
+                    v-else
+                  ></image>
                 </view>
                 <view class="box_left">
                   <navigator :url="'/pages/product/index?product_id=' + item.product_id">
@@ -34,11 +48,11 @@
                 <view class="box_right">
                   <view class="buy_num_box">
                     <button class="buy_num_sub" @click="changeQuantity(pIndex, index, -1)" data-eventsync="true">
-                      <image class="sub_icon" src="../../static/icon/sub_icon.png" mode=""></image>
+                      <image class="sub_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/sub_icon.png" mode=""></image>
                     </button>
                     <input type="number" class="buy_num" placeholder="数量" v-model="item.buy_num" @blur="changeQuantity(pIndex, index, 0)" />
                     <button class="buy_num_add" @click="changeQuantity(pIndex, index, +1)" data-eventsync="true">
-                      <image class="add_icon" src="../../static/icon/add_icon.png" mode=""></image>
+                      <image class="add_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/add_icon.png" mode=""></image>
                     </button>
                   </view>
                 </view>
@@ -52,7 +66,10 @@
     <view class="to_bottom" v-if="cartList.length"> -----到底啦-----</view>
     <view class="bottom_box">
       <view class="check_all_label" @click="checkAll()">
-        <image class="checkbox" :src="checkedAll ? '../../static/icon/checked.png' : '../../static/icon/checkbox.png'"></image>
+        <image
+          class="checkbox"
+          :src="checkedAll ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checked.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox.png'"
+        ></image>
         <text class="checkall">全选</text>
       </view>
       <view class="price_box">

+ 9 - 2
pages/car/order.vue

@@ -111,7 +111,11 @@
               <text class="" v-if="item.type_id == 2">全场可用</text>
               <view class="check_label">
                 <view class="isstd" v-if="!item.is_std">不可用</view>
-                <image class="checkbox" v-if="item.is_std" :src="item.checked ? '../../static/icon/checked.png' : '../../static/icon/checkbox.png'"></image>
+                <image
+                  class="checkbox"
+                  v-if="item.is_std"
+                  :src="item.checked ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checked.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox.png'"
+                ></image>
               </view>
             </view>
             <view class="coupon_info">
@@ -129,7 +133,10 @@
       <view class="addr_list">
         <view class="addr_item" v-for="(item, index) in addrList" :key="index" @click="checkedAddrItem(item)">
           <view class="radio_label">
-            <image class="radio_icon" :src="item.id == checkedAddr.id ? '../../static/icon/radioed.png' : '../../static/icon/radio.png'"></image>
+            <image
+              class="radio_icon"
+              :src="item.id == checkedAddr.id ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'"
+            ></image>
           </view>
           <view class="contact_user">
             <text class="contact_name">{{ item.contact_name }}</text>

+ 6 - 2
pages/login/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view>
     <view class="logo_box">
-      <image src="../../static/logo2.jpg" class="logo_image"></image>
+      <image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/logo2.jpg" class="logo_image"></image>
     </view>
     <view class="login_content">
       <!-- #ifdef MP-WEIXIN -->
@@ -15,7 +15,11 @@
         <button @click="toutiao_login" class="get_phone">抖音用户手机号授权登录</button>
         <!-- <button class="get_phone" style="margin-top: 40rpx; background-color: #fff; color: #333">手机号验证登录</button> -->
         <view class="policy_content">
-          <image class="checkbox" @click="changeAgreePolicy" :src="agreePolicy ? '../../static/icon/checked.png' : '../../static/icon/checkbox.png'"></image>
+          <image
+            class="checkbox"
+            @click="changeAgreePolicy"
+            :src="agreePolicy ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checked.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox.png'"
+          ></image>
           我已阅读并同意
           <navigator url="/pages/policy/index" style="color: #e03519">《服务协议》</navigator>
         </view>

+ 624 - 614
pages/orders/lottery.vue

@@ -1,622 +1,632 @@
 <template>
-	<view>
-		<view class="lottery_box" :style="height">
-			<view class="lottery_time" v-if="lotteryInfo.id">活动时间:{{lotteryInfo.start_date}} ~ {{lotteryInfo.end_date}}</view>
-			<view class="lottery_info">
-				<image class="lottery_logo" v-if="lotteryInfo.logo" :src="lotteryInfo.logo" mode="widthFix"></image>
-				<button class="lottery_rule_btn" @click="showRule">活动规则</button>
-			</view>
-			<l-dialer :customStyle="'width: 500rpx;height: 500rpx;margin: 0rpx auto;'" @click="onClick" dial-style="color: rgba(60,48,158,0.7); padding: 32rpx;background-image: url(https://mall.findit.ltd/uploads/images/default/lottery_bg.png)" :prizeList="prizeList" :turns="5" :duration="5" @done="onDone" ref="dialer" />
-			<view class="record_box">
-				<view class="score_info">
-					<view class="custom_score">可用次数:{{lotteryInfo.join_num}}</view>
-					<view class="need_score" v-if="!lotteryInfo.id" >暂无可参与的活动</view>
-				</view>
-				<button class="lottery_record" @click="showRecord" v-if="lotteryInfo.id">
-					<image class="lottery_record_img" src="https://mall.findit.ltd/uploads/images/default/lottery_record.png" mode=""></image>
-					<text class="lottery_record_text">中奖记录</text>
-				</button>
-			</view>
-		</view>
-		<uni-popup ref="lotteryRule" type="center">
-			<view class="lottery_rule_box">
-				<view class="lottery_rule_title">
-					<text>活动规则</text>
-					<view class="close_btn" @click="closeRule"> X </view>
-				</view>
-				<scroll-view class="lottery_rule_info" scroll-y="true" >
-					<rich-text :nodes="lotteryInfo.rule" class="rich_text"></rich-text>
-				</scroll-view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="lotteryRecord" type="bottom">
-			<view class="lottery_record_box">
-				<view class="lottery_record_title">
-					<text>我的奖品</text>
-					<view class="close_btn" @click="closeRecord"> X </view>
-				</view>
-				<view class="lottery_record_none" v-if="!recordList.length">这里还是空的哦~</view>
-				<scroll-view class="lottery_record_list" scroll-y="true" >
-					<view class="lottery_record_item" v-for="(item,index) in recordList" :key="index">
-						<view class="reward_time">{{item.insert_time}}</view>
-						<view class="reward_name">{{item.reward_name}}</view>
-						<view class="reward_state" v-if="item.status">{{item.state}}</view>
-						<view class="reward_state" v-if="!item.status" @click="openAddr(index)">{{item.state}}</view>
-					</view>
-				</scroll-view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="addrPopup" type="bottom" class="popup" background-color="#FFFFFF" >
-			<view class="popup_title">收货地址 <navigator url="/pages/addr/index?notify=addr" class="to_addr_page">管理</navigator> </view>
-			<view class="addr_list">
-				<view class="addr_item" v-for="(item,index) in addrList" :key="index" @click="checkedAddrItem(item)">
-					<view class="radio_label">
-						<image class="radio_icon" :src="item.id == checkedAddr.id? '../../static/icon/radioed.png' : '../../static/icon/radio.png'" ></image> 
-					</view>
-					<view class="contact_user">
-						<text class="contact_name">{{item.contact_name}}</text>
-						<text class="contact_phone">{{item.contact_phone}}</text>
-						<text class="contact_default" v-if="item.is_default">默认</text>
-						<text class="contact_shop">{{item.contact_shop}}</text>
-					</view>
-					<view class="contact_addr">
-						{{item.contact_province}} {{item.contact_city}} {{item.contact_area}} {{item.contact_addr}}
-					</view>
-				</view>
-			</view>
-			<view class="create_box">
-				<navigator url="/pages/addr/index?notify=addr&type=create" class="create_addr"  >新建收货地址</navigator>
-			</view>
-		</uni-popup>
-	</view>
+  <view>
+    <view class="lottery_box" :style="height">
+      <view class="lottery_time" v-if="lotteryInfo.id">活动时间:{{ lotteryInfo.start_date }} ~ {{ lotteryInfo.end_date }}</view>
+      <view class="lottery_info">
+        <image class="lottery_logo" v-if="lotteryInfo.logo" :src="lotteryInfo.logo" mode="widthFix"></image>
+        <button class="lottery_rule_btn" @click="showRule">活动规则</button>
+      </view>
+      <l-dialer
+        :customStyle="'width: 500rpx;height: 500rpx;margin: 0rpx auto;'"
+        @click="onClick"
+        dial-style="color: rgba(60,48,158,0.7); padding: 32rpx;background-image: url(https://mall.findit.ltd/uploads/images/default/lottery_bg.png)"
+        :prizeList="prizeList"
+        :turns="5"
+        :duration="5"
+        @done="onDone"
+        ref="dialer"
+      />
+      <view class="record_box">
+        <view class="score_info">
+          <view class="custom_score">可用次数:{{ lotteryInfo.join_num }}</view>
+          <view class="need_score" v-if="!lotteryInfo.id">暂无可参与的活动</view>
+        </view>
+        <button class="lottery_record" @click="showRecord" v-if="lotteryInfo.id">
+          <image class="lottery_record_img" src="https://mall.findit.ltd/uploads/images/default/lottery_record.png" mode=""></image>
+          <text class="lottery_record_text">中奖记录</text>
+        </button>
+      </view>
+    </view>
+    <uni-popup ref="lotteryRule" type="center">
+      <view class="lottery_rule_box">
+        <view class="lottery_rule_title">
+          <text>活动规则</text>
+          <view class="close_btn" @click="closeRule"> X </view>
+        </view>
+        <scroll-view class="lottery_rule_info" scroll-y="true">
+          <rich-text :nodes="lotteryInfo.rule" class="rich_text"></rich-text>
+        </scroll-view>
+      </view>
+    </uni-popup>
+    <uni-popup ref="lotteryRecord" type="bottom">
+      <view class="lottery_record_box">
+        <view class="lottery_record_title">
+          <text>我的奖品</text>
+          <view class="close_btn" @click="closeRecord"> X </view>
+        </view>
+        <view class="lottery_record_none" v-if="!recordList.length">这里还是空的哦~</view>
+        <scroll-view class="lottery_record_list" scroll-y="true">
+          <view class="lottery_record_item" v-for="(item, index) in recordList" :key="index">
+            <view class="reward_time">{{ item.insert_time }}</view>
+            <view class="reward_name">{{ item.reward_name }}</view>
+            <view class="reward_state" v-if="item.status">{{ item.state }}</view>
+            <view class="reward_state" v-if="!item.status" @click="openAddr(index)">{{ item.state }}</view>
+          </view>
+        </scroll-view>
+      </view>
+    </uni-popup>
+    <uni-popup ref="addrPopup" type="bottom" class="popup" background-color="#FFFFFF">
+      <view class="popup_title">收货地址 <navigator url="/pages/addr/index?notify=addr" class="to_addr_page">管理</navigator> </view>
+      <view class="addr_list">
+        <view class="addr_item" v-for="(item, index) in addrList" :key="index" @click="checkedAddrItem(item)">
+          <view class="radio_label">
+            <image
+              class="radio_icon"
+              :src="item.id == checkedAddr.id ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'"
+            ></image>
+          </view>
+          <view class="contact_user">
+            <text class="contact_name">{{ item.contact_name }}</text>
+            <text class="contact_phone">{{ item.contact_phone }}</text>
+            <text class="contact_default" v-if="item.is_default">默认</text>
+            <text class="contact_shop">{{ item.contact_shop }}</text>
+          </view>
+          <view class="contact_addr"> {{ item.contact_province }} {{ item.contact_city }} {{ item.contact_area }} {{ item.contact_addr }} </view>
+        </view>
+      </view>
+      <view class="create_box">
+        <navigator url="/pages/addr/index?notify=addr&type=create" class="create_addr">新建收货地址</navigator>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				height:"",
-				// 奖项列表,
-				prizeList: [],
-				// 中奖记录
-				recordList: [],
-				// 地址列表
-				addrList:[],
-				// 抽奖信息
-				lotteryInfo:{
-					id:0,
-					name:"",
-					logo:"",
-					join_num:"0",
-					start_date:"",
-					end_date:"",
-					start_time:"",
-					end_time:"",
-					rule:"",
-				},
-				recordId:0,
-				// 请求参数
-				requestParam:{
-					id:0
-				},
-			}
-		},
-		onLoad(param) {
-			// 接收参数
-			this.requestParam.id = param.id;
-			// 如果有scene参数的话,获取其中的ID
-			if( param.scene )	{
-				// 转键值对参数
-				let scene		= this.$http.strToParam(param.scene);
-				// 如果没有传入ID,但是传入了场景ID,获取场景ID
-				if( !param.id && scene.id )	this.requestParam.id = scene.id;
-			}
-			// 窗口信息
-			var sysinfo = uni.getWindowInfo();
-			// 获取屏幕可用高度
-			this.height = 'height:'+sysinfo.windowHeight + 'px;';
-			// 监听地址变动
-			uni.$on('addr_list_change',data=>{
-				// 地址列表
-				this.addrList = data.list;
-			});
-			// #ifdef MP-WEIXIN
-			//分享按钮
-			uni.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			})
-			// #endif
-		},
-		onShareAppMessage(obj) {
-			return {
-				title: this.activeInfo.name,
-				path: '/pages/orders/lottery?id='+this.requestParam.id,
-			}
-		},
-		onShow() {
-			// 没有数据的话,或者请求中,不允许刷新
-			if( this.isReqing )		return ;
-			// 登录提示
-			if( !this.$checkAccess.alterLogin() )  return ;
-			// 如果存在产品ID的话
-			if( this.requestParam.id > 0) {
-				// 设置请求中
-				this.isReqing			= true;
-				// 请求
-				this.$http.request('api/lottery_order/get_detail',this.requestParam).then((re)=>{
-					// 设置非请求中
-					this.isReqing		= false;
-					// 成功结果
-					if( re.code == 'success' ){
-						this.lotteryInfo	= re.data;
-						this.prizeList 		= re.data.reward_list;
-					}else{
-						if( re.code != 'no_login' ){
-							uni.showModal({
-								content:re.msg,
-								showCancel:false,
-							})
-						}
-					}
-				});
-			}else{
-				uni.showModal({
-					content:"未知的活动ID",
-					showCancel:false,
-				})
-			}
-		},
-		methods: {
-			onDone(index) {
-				// 奖项
-				let prize = this.prizeList[index];
-				// 结果
-				uni.showModal({
-					title: prize.id == 0 ? '很遗憾': '恭喜您',
-					content: (prize.id != 0 ? `获得`:'') + prize.name + (prize.reward_type == 5 ? ',请在中奖记录中填写收货地址':''),
-					showCancel:false,
-					success: (re) => {
-						if( re.confirm && prize.reward_type == 5){
-							// 显示中奖列表
-							this.showRecord();
-						}
-					}
-				});
-			},
-			onClick() {
-				// 活动是否开始
-				if( !this.lotteryInfo.id ){
-					uni.showToast({
-						title:"暂无可参与活动",
-						icon:"none",
-					})
-					return;
-				}
-				// 活动是否开始
-				if( this.lotteryInfo.start_time * 1000 > new Date().getTime() ){
-					uni.showToast({
-						title:"活动还没开始哦",
-						icon:"none",
-					})
-					return;
-				}
-				// 活动是否结束
-				if( this.lotteryInfo.end_time * 1000 <= new Date().getTime() ){
-					uni.showToast({
-						title:"活动已结束了哦",
-						icon:"none",
-					})
-					return;
-				}
-				// 次数已用完了
-				if( this.lotteryInfo.join_num <= 0 ){
-					uni.showToast({
-						title:"次数已用完了",
-						icon:"none",
-					})
-					return;
-				}
-				// 次数操作
-				this.lotteryInfo.join_num = this.lotteryInfo.join_num - 1;
-				// 请求列表
-				this.$http.request('/api/lottery_order/get_reward',{lottery_id:this.lotteryInfo.id}).then((re)=>{
-					// 设置非请求中
-					this.isReqing		= false;
-					// 成功结果
-					if( re.code == 'success' ){
-						// 奖品列表更新
-						this.prizeList	= re.data.reward_list;
-						// 奖品的索引
-						return 			this.$refs.dialer.run(re.data.reward_index);
-					}else{
-						uni.showToast({
-							title:re.msg,
-							icon:"none",
-						})
-						return ;
-					}
-				});
-			},
-			showRule(){
-				this.$refs.lotteryRule.open('center')
-			},
-			closeRule(){
-				this.$refs.lotteryRule.close();
-			},
-			showRecord(){
-				// 活动是否开始
-				if( this.lotteryInfo.id ){
-					// 请求列表
-					this.$http.request('/api/lottery_order_record/get_list',{lottery_id:this.lotteryInfo.id}).then((re)=>{
-						// 设置非请求中
-						this.isReqing		= false;
-						// 成功结果
-						if( re.code == 'success' ){
-							this.recordList	= re.data;
-						}
-					});
-				}
-				this.$refs.lotteryRecord.open('bottom');
-			},
-			closeRecord(){
-				this.$refs.lotteryRecord.close();
-			},
-			openAddr(index){
-				// 选择的下标
-				this.recordIndex = index;
-				// 地址列表
-				this.getAddrList(true);
-			},
-			// 选择地址
-			checkedAddrItem(item){
-				// 判断数据
-				this.$http.request('api/lottery_order_record/set_addr',{id:this.recordList[this.recordIndex].id,addr_id:item.id},'post').then((callback)=>{
-					// 获取成功
-					if( callback.code == 'success' ){
-						this.recordList[this.recordIndex].status = 1;
-						this.recordList[this.recordIndex].state  = '进行中';
-					}
-					this.$refs.addrPopup.close();
-				});
-			},
-			getAddrList(showPopup=false){
-				// 判断数据
-				this.$http.request('api/custom_addr/get_list').then((callback)=>{
-					// 获取成功
-					if( callback.code == 'success' ){
-						this.addrList  = callback.data;
-						// 如果有的话
-						if( this.addrList.length ){
-							// 获取默认的
-							for (let i in this.addrList) {
-								// 如果是默认的
-								if( this.addrList[i].is_default ) this.checkedAddr = this.addrList[i];
-							}
-							// 如果没有默认的话
-							if( !this.checkedAddr.id ){
-								this.checkedAddr = this.addrList[this.addrList.length-1];
-							}
-						}
-						// 弹出地址层
-						if( showPopup ) this.$refs.addrPopup.open('bottom');
-					}
-				});
-			},
-		}
-	}
+export default {
+  data() {
+    return {
+      height: "",
+      // 奖项列表,
+      prizeList: [],
+      // 中奖记录
+      recordList: [],
+      // 地址列表
+      addrList: [],
+      // 抽奖信息
+      lotteryInfo: {
+        id: 0,
+        name: "",
+        logo: "",
+        join_num: "0",
+        start_date: "",
+        end_date: "",
+        start_time: "",
+        end_time: "",
+        rule: "",
+      },
+      recordId: 0,
+      // 请求参数
+      requestParam: {
+        id: 0,
+      },
+    };
+  },
+  onLoad(param) {
+    // 接收参数
+    this.requestParam.id = param.id;
+    // 如果有scene参数的话,获取其中的ID
+    if (param.scene) {
+      // 转键值对参数
+      let scene = this.$http.strToParam(param.scene);
+      // 如果没有传入ID,但是传入了场景ID,获取场景ID
+      if (!param.id && scene.id) this.requestParam.id = scene.id;
+    }
+    // 窗口信息
+    var sysinfo = uni.getWindowInfo();
+    // 获取屏幕可用高度
+    this.height = "height:" + sysinfo.windowHeight + "px;";
+    // 监听地址变动
+    uni.$on("addr_list_change", (data) => {
+      // 地址列表
+      this.addrList = data.list;
+    });
+    // #ifdef MP-WEIXIN
+    //分享按钮
+    uni.showShareMenu({
+      withShareTicket: true,
+      menus: ["shareAppMessage", "shareTimeline"],
+    });
+    // #endif
+  },
+  onShareAppMessage(obj) {
+    return {
+      title: this.activeInfo.name,
+      path: "/pages/orders/lottery?id=" + this.requestParam.id,
+    };
+  },
+  onShow() {
+    // 没有数据的话,或者请求中,不允许刷新
+    if (this.isReqing) return;
+    // 登录提示
+    if (!this.$checkAccess.alterLogin()) return;
+    // 如果存在产品ID的话
+    if (this.requestParam.id > 0) {
+      // 设置请求中
+      this.isReqing = true;
+      // 请求
+      this.$http.request("api/lottery_order/get_detail", this.requestParam).then((re) => {
+        // 设置非请求中
+        this.isReqing = false;
+        // 成功结果
+        if (re.code == "success") {
+          this.lotteryInfo = re.data;
+          this.prizeList = re.data.reward_list;
+        } else {
+          if (re.code != "no_login") {
+            uni.showModal({
+              content: re.msg,
+              showCancel: false,
+            });
+          }
+        }
+      });
+    } else {
+      uni.showModal({
+        content: "未知的活动ID",
+        showCancel: false,
+      });
+    }
+  },
+  methods: {
+    onDone(index) {
+      // 奖项
+      let prize = this.prizeList[index];
+      // 结果
+      uni.showModal({
+        title: prize.id == 0 ? "很遗憾" : "恭喜您",
+        content: (prize.id != 0 ? `获得` : "") + prize.name + (prize.reward_type == 5 ? ",请在中奖记录中填写收货地址" : ""),
+        showCancel: false,
+        success: (re) => {
+          if (re.confirm && prize.reward_type == 5) {
+            // 显示中奖列表
+            this.showRecord();
+          }
+        },
+      });
+    },
+    onClick() {
+      // 活动是否开始
+      if (!this.lotteryInfo.id) {
+        uni.showToast({
+          title: "暂无可参与活动",
+          icon: "none",
+        });
+        return;
+      }
+      // 活动是否开始
+      if (this.lotteryInfo.start_time * 1000 > new Date().getTime()) {
+        uni.showToast({
+          title: "活动还没开始哦",
+          icon: "none",
+        });
+        return;
+      }
+      // 活动是否结束
+      if (this.lotteryInfo.end_time * 1000 <= new Date().getTime()) {
+        uni.showToast({
+          title: "活动已结束了哦",
+          icon: "none",
+        });
+        return;
+      }
+      // 次数已用完了
+      if (this.lotteryInfo.join_num <= 0) {
+        uni.showToast({
+          title: "次数已用完了",
+          icon: "none",
+        });
+        return;
+      }
+      // 次数操作
+      this.lotteryInfo.join_num = this.lotteryInfo.join_num - 1;
+      // 请求列表
+      this.$http.request("/api/lottery_order/get_reward", { lottery_id: this.lotteryInfo.id }).then((re) => {
+        // 设置非请求中
+        this.isReqing = false;
+        // 成功结果
+        if (re.code == "success") {
+          // 奖品列表更新
+          this.prizeList = re.data.reward_list;
+          // 奖品的索引
+          return this.$refs.dialer.run(re.data.reward_index);
+        } else {
+          uni.showToast({
+            title: re.msg,
+            icon: "none",
+          });
+          return;
+        }
+      });
+    },
+    showRule() {
+      this.$refs.lotteryRule.open("center");
+    },
+    closeRule() {
+      this.$refs.lotteryRule.close();
+    },
+    showRecord() {
+      // 活动是否开始
+      if (this.lotteryInfo.id) {
+        // 请求列表
+        this.$http.request("/api/lottery_order_record/get_list", { lottery_id: this.lotteryInfo.id }).then((re) => {
+          // 设置非请求中
+          this.isReqing = false;
+          // 成功结果
+          if (re.code == "success") {
+            this.recordList = re.data;
+          }
+        });
+      }
+      this.$refs.lotteryRecord.open("bottom");
+    },
+    closeRecord() {
+      this.$refs.lotteryRecord.close();
+    },
+    openAddr(index) {
+      // 选择的下标
+      this.recordIndex = index;
+      // 地址列表
+      this.getAddrList(true);
+    },
+    // 选择地址
+    checkedAddrItem(item) {
+      // 判断数据
+      this.$http.request("api/lottery_order_record/set_addr", { id: this.recordList[this.recordIndex].id, addr_id: item.id }, "post").then((callback) => {
+        // 获取成功
+        if (callback.code == "success") {
+          this.recordList[this.recordIndex].status = 1;
+          this.recordList[this.recordIndex].state = "进行中";
+        }
+        this.$refs.addrPopup.close();
+      });
+    },
+    getAddrList(showPopup = false) {
+      // 判断数据
+      this.$http.request("api/custom_addr/get_list").then((callback) => {
+        // 获取成功
+        if (callback.code == "success") {
+          this.addrList = callback.data;
+          // 如果有的话
+          if (this.addrList.length) {
+            // 获取默认的
+            for (let i in this.addrList) {
+              // 如果是默认的
+              if (this.addrList[i].is_default) this.checkedAddr = this.addrList[i];
+            }
+            // 如果没有默认的话
+            if (!this.checkedAddr.id) {
+              this.checkedAddr = this.addrList[this.addrList.length - 1];
+            }
+          }
+          // 弹出地址层
+          if (showPopup) this.$refs.addrPopup.open("bottom");
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	.lottery_box{
-		display: block;
-		width: 750rpx;
-		height: 1100rpx;
-		margin: 0 auto;
-		position: relative;
-		background: linear-gradient(to bottom, #FC335F 0%, #FB7224 80%, #FFFFFF 100%);
-		.lottery_time{
-			top: 0rpx;
-			left: 35rpx;
-			z-index: 1;
-			width: 700rpx;
-			color: #FFFFFF;
-			display: block;
-			height: 40rpx;
-			font-size: 24rpx;
-			line-height: 40rpx;
-			text-align: center;
-			position: absolute;
-			border-radius: 10rpx;
-			background-color: rgba(0, 0, 0,0.15);
-		}
-		.lottery_info{
-			width: 750rpx;
-			height: 240rpx;
-			overflow: hidden;
-			margin: 0rpx auto;
-			position: relative;
-			margin-bottom: 40rpx;
-			.lottery_logo{
-				float: left;
-				width: 750rpx;
-				height: 240rpx;
-				display: block;
-			}
-			.lottery_rule_btn{
-				top: 50%;
-				right: 0rpx;
-				width: 120rpx;
-				height: 60rpx;
-				color: #FFFFFF;
-				overflow: hidden;
-				font-size: 24rpx;
-				text-align: center;
-				line-height: 60rpx;
-				position: absolute;
-				padding: 0rpx 0rpx;
-				border-top-left-radius: 30rpx;
-				border-bottom-left-radius: 30rpx;
-				border-top-right-radius: 0rpx;
-				border-bottom-right-radius: 0rpx;
-				background-color: rgba(0, 0, 0,0.3);
-			}
-			.lottery_rule_btn::after{
-				border: 0rpx solid transparent;
-			}
-		}
-		.record_box{
-			display: block;
-			height: 120rpx;
-			overflow: hidden;
-			position: relative;
-			margin-top: 40rpx;
-			.score_info{
-				display: block;
-				overflow: auto;
-				.custom_score{
-					height: 60rpx;
-					font-size: 28rpx;
-					text-align: center;
-					line-height: 60rpx;
-				}
-				.need_score{
-					height: 60rpx;
-					font-size: 32rpx;
-					text-align: center;
-					line-height: 60rpx;
-				}
-			}
-			.lottery_record{
-				top: 0rpx;
-				right: 0rpx;
-				width: 120rpx;
-				height: 120rpx;
-				overflow: hidden;
-				text-align: center;
-				position: absolute;
-				padding: 0rpx 0rpx;
-				background-color: transparent;
-				.lottery_record_img{
-					width: 60rpx;
-					height: 60rpx;
-					display: block;
-					margin: 0rpx auto;
-				}
-				.lottery_record_text{
-					color: #FFFFFF;
-					display: block;
-					height: 40rpx;
-					width: 120rpx;
-					font-size: 24rpx;
-					line-height: 40rpx;
-				}
-			}
-			.lottery_record::after{
-				border: none;
-			}
-		}
-	}
-	.lottery_rule_box{
-		width: 500rpx;
-		display: block;
-		overflow: hidden;
-		background: #FFFFFF;
-		font-size: 26rpx;
-		margin: 0rpx auto;
-		line-height: 50rpx;
-		border-radius: 10rpx;
-		padding: 0rpx 25rpx;
-		padding-bottom: 20rpx;
-		background-color: #FC335F;
-		.lottery_rule_title{
-			color: #FFFFFF;
-			height: 60rpx;
-			font-size: 32rpx;
-			line-height: 60rpx;
-			text-align: center;
-			margin-bottom: 10rpx;
-			.close_btn{
-				float: right;
-				width: 40rpx;
-				height: 40rpx;
-				font-size: 24rpx;
-				margin-top: 9rpx;
-				line-height: 40rpx;
-				border-radius: 50%;
-				border: 1rpx solid #FFFFFF;
-			}
-		}
-		.lottery_rule_info{
-			display: block;
-			height: 500rpx;
-			font-size: 24rpx;
-			line-height: 40rpx;
-			border-radius: 10rpx;
-			padding: 20rpx 20rpx;
-			box-sizing: border-box;
-			background-color: #FFFFFF;
-			.rich_text{
-				white-space: break-spaces;
-			}
-		}
-	}
-	.lottery_record_box{
-		display: block;
-		color: #DEB887;
-		height: 700rpx;
-		padding: 10rpx 25rpx;
-		background-color: #FAEBD7;
-		.lottery_record_title{
-			color: #000000;
-			height: 80rpx;
-			font-weight: bold;
-			font-size: 32rpx;
-			line-height: 80rpx;
-			text-align: center;
-			margin-bottom: 20rpx;
-			.close_btn{
-				float: right;
-				width: 40rpx;
-				height: 40rpx;
-				color: #DEB887;
-				font-size: 24rpx;
-				margin-top: 9rpx;
-				line-height: 40rpx;
-				border-radius: 50%;
-				border: 2rpx solid #DEB887;
-			}
-		}
-		.lottery_record_none{
-			display: block;
-			height: 200rpx;
-			color: #DEB887;
-			font-size: 26rpx;
-			text-align: center;
-			line-height: 200rpx;
-		}
-		.lottery_record_list{
-			display: block;
-			height: 500rpx;
-			.lottery_record_item{
-				height: 80rpx;
-				display: block;
-				font-size: 26rpx;
-				overflow: hidden;
-				line-height: 80rpx;
-				.reward_time{
-					float: left;
-					width: 300rpx;
-				}
-				.reward_name{
-					float: left;
-					width: 200rpx;
-				}
-				.reward_state{
-					float: right;
-				}
-			}
-		}
-	}
-	.popup{
-		overflow: hidden;
-		.popup_title{
-			display: block;
-			overflow: hidden;
-			margin: 0rpx auto;
-			font-size: 36rpx;
-			height: 120rpx;
-			line-height: 120rpx;
-			padding: 0rpx 20rpx;
-			border-bottom: 10rpx solid #F8F8F8;
-			.to_addr_page{
-				float: right;
-				color: #F59A23;
-				display: block;
-				height: 120rpx;
-				line-height: 120rpx;
-				font-size: 26rpx;
-				padding: 0rpx 10rpx;
-			}
-		}
-		.addr_list{
-			width: 730rpx;
-			display: block;
-			overflow: hidden;
-			margin: 0rpx auto;
-			min-height: 500rpx;
-			.addr_item{
-				display: block;
-				font-size: 24rpx;
-				overflow: hidden;
-				line-height: 40rpx;
-				padding: 15rpx 10rpx;
-				border-radius: 15rpx;
-				border-bottom: 2rpx solid #dddddd;
-				.radio_label{
-					width: 40rpx;
-					float: left;
-					height: 50rpx;
-					padding-top: 30rpx;
-					margin-right: 20rpx;
-					.radio_icon{
-						float: left;
-						width: 40rpx;
-						height: 40rpx;
-					}
-				}
-				.contact_user{
-					float: left;
-					width: 640rpx;
-					display: block;
-					height: 50rpx;
-					font-size: 24rpx;
-					line-height: 50rpx;
-					.contact_name{
-						font-size: 26rpx;
-						font-weight: bold;
-						margin-right: 16rpx;
-					}
-					.contact_default{
-						color: #F59A23;
-						font-size: 20rpx;
-						margin-left: 16rpx;
-						border: 1rpx solid #F59A23;
-					}
-					.contact_shop{
-						float: right;
-						font-size: 26rpx;
-						margin-right: 16rpx;
-					}
-				}
-				.contact_addr{
-					float: left;
-					width: 640rpx;
-					display: block;
-					font-size: 24rpx;
-					line-height: 30rpx;
-					padding: 10rpx 5rpx;
-				}
-			}
-		}
-		.create_box{
-			height: 140rpx;
-			display: block;
-			.create_addr{
-				width: 700rpx;
-				height: 80rpx;
-				display: block;
-				color: #FFFFFF;
-				font-size: 30rpx;
-				overflow: hidden;
-				line-height: 80rpx;
-				padding: 0rpx 0rpx;
-				text-align: center;
-				margin: 0rpx auto;
-				margin-top: 20rpx;
-				border-radius: 40rpx;
-				background-color: #E03519;
-			}
-		}
-	}
+.lottery_box {
+  display: block;
+  width: 750rpx;
+  height: 1100rpx;
+  margin: 0 auto;
+  position: relative;
+  background: linear-gradient(to bottom, #fc335f 0%, #fb7224 80%, #ffffff 100%);
+  .lottery_time {
+    top: 0rpx;
+    left: 35rpx;
+    z-index: 1;
+    width: 700rpx;
+    color: #ffffff;
+    display: block;
+    height: 40rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    text-align: center;
+    position: absolute;
+    border-radius: 10rpx;
+    background-color: rgba(0, 0, 0, 0.15);
+  }
+  .lottery_info {
+    width: 750rpx;
+    height: 240rpx;
+    overflow: hidden;
+    margin: 0rpx auto;
+    position: relative;
+    margin-bottom: 40rpx;
+    .lottery_logo {
+      float: left;
+      width: 750rpx;
+      height: 240rpx;
+      display: block;
+    }
+    .lottery_rule_btn {
+      top: 50%;
+      right: 0rpx;
+      width: 120rpx;
+      height: 60rpx;
+      color: #ffffff;
+      overflow: hidden;
+      font-size: 24rpx;
+      text-align: center;
+      line-height: 60rpx;
+      position: absolute;
+      padding: 0rpx 0rpx;
+      border-top-left-radius: 30rpx;
+      border-bottom-left-radius: 30rpx;
+      border-top-right-radius: 0rpx;
+      border-bottom-right-radius: 0rpx;
+      background-color: rgba(0, 0, 0, 0.3);
+    }
+    .lottery_rule_btn::after {
+      border: 0rpx solid transparent;
+    }
+  }
+  .record_box {
+    display: block;
+    height: 120rpx;
+    overflow: hidden;
+    position: relative;
+    margin-top: 40rpx;
+    .score_info {
+      display: block;
+      overflow: auto;
+      .custom_score {
+        height: 60rpx;
+        font-size: 28rpx;
+        text-align: center;
+        line-height: 60rpx;
+      }
+      .need_score {
+        height: 60rpx;
+        font-size: 32rpx;
+        text-align: center;
+        line-height: 60rpx;
+      }
+    }
+    .lottery_record {
+      top: 0rpx;
+      right: 0rpx;
+      width: 120rpx;
+      height: 120rpx;
+      overflow: hidden;
+      text-align: center;
+      position: absolute;
+      padding: 0rpx 0rpx;
+      background-color: transparent;
+      .lottery_record_img {
+        width: 60rpx;
+        height: 60rpx;
+        display: block;
+        margin: 0rpx auto;
+      }
+      .lottery_record_text {
+        color: #ffffff;
+        display: block;
+        height: 40rpx;
+        width: 120rpx;
+        font-size: 24rpx;
+        line-height: 40rpx;
+      }
+    }
+    .lottery_record::after {
+      border: none;
+    }
+  }
+}
+.lottery_rule_box {
+  width: 500rpx;
+  display: block;
+  overflow: hidden;
+  background: #ffffff;
+  font-size: 26rpx;
+  margin: 0rpx auto;
+  line-height: 50rpx;
+  border-radius: 10rpx;
+  padding: 0rpx 25rpx;
+  padding-bottom: 20rpx;
+  background-color: #fc335f;
+  .lottery_rule_title {
+    color: #ffffff;
+    height: 60rpx;
+    font-size: 32rpx;
+    line-height: 60rpx;
+    text-align: center;
+    margin-bottom: 10rpx;
+    .close_btn {
+      float: right;
+      width: 40rpx;
+      height: 40rpx;
+      font-size: 24rpx;
+      margin-top: 9rpx;
+      line-height: 40rpx;
+      border-radius: 50%;
+      border: 1rpx solid #ffffff;
+    }
+  }
+  .lottery_rule_info {
+    display: block;
+    height: 500rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    border-radius: 10rpx;
+    padding: 20rpx 20rpx;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    .rich_text {
+      white-space: break-spaces;
+    }
+  }
+}
+.lottery_record_box {
+  display: block;
+  color: #deb887;
+  height: 700rpx;
+  padding: 10rpx 25rpx;
+  background-color: #faebd7;
+  .lottery_record_title {
+    color: #000000;
+    height: 80rpx;
+    font-weight: bold;
+    font-size: 32rpx;
+    line-height: 80rpx;
+    text-align: center;
+    margin-bottom: 20rpx;
+    .close_btn {
+      float: right;
+      width: 40rpx;
+      height: 40rpx;
+      color: #deb887;
+      font-size: 24rpx;
+      margin-top: 9rpx;
+      line-height: 40rpx;
+      border-radius: 50%;
+      border: 2rpx solid #deb887;
+    }
+  }
+  .lottery_record_none {
+    display: block;
+    height: 200rpx;
+    color: #deb887;
+    font-size: 26rpx;
+    text-align: center;
+    line-height: 200rpx;
+  }
+  .lottery_record_list {
+    display: block;
+    height: 500rpx;
+    .lottery_record_item {
+      height: 80rpx;
+      display: block;
+      font-size: 26rpx;
+      overflow: hidden;
+      line-height: 80rpx;
+      .reward_time {
+        float: left;
+        width: 300rpx;
+      }
+      .reward_name {
+        float: left;
+        width: 200rpx;
+      }
+      .reward_state {
+        float: right;
+      }
+    }
+  }
+}
+.popup {
+  overflow: hidden;
+  .popup_title {
+    display: block;
+    overflow: hidden;
+    margin: 0rpx auto;
+    font-size: 36rpx;
+    height: 120rpx;
+    line-height: 120rpx;
+    padding: 0rpx 20rpx;
+    border-bottom: 10rpx solid #f8f8f8;
+    .to_addr_page {
+      float: right;
+      color: #f59a23;
+      display: block;
+      height: 120rpx;
+      line-height: 120rpx;
+      font-size: 26rpx;
+      padding: 0rpx 10rpx;
+    }
+  }
+  .addr_list {
+    width: 730rpx;
+    display: block;
+    overflow: hidden;
+    margin: 0rpx auto;
+    min-height: 500rpx;
+    .addr_item {
+      display: block;
+      font-size: 24rpx;
+      overflow: hidden;
+      line-height: 40rpx;
+      padding: 15rpx 10rpx;
+      border-radius: 15rpx;
+      border-bottom: 2rpx solid #dddddd;
+      .radio_label {
+        width: 40rpx;
+        float: left;
+        height: 50rpx;
+        padding-top: 30rpx;
+        margin-right: 20rpx;
+        .radio_icon {
+          float: left;
+          width: 40rpx;
+          height: 40rpx;
+        }
+      }
+      .contact_user {
+        float: left;
+        width: 640rpx;
+        display: block;
+        height: 50rpx;
+        font-size: 24rpx;
+        line-height: 50rpx;
+        .contact_name {
+          font-size: 26rpx;
+          font-weight: bold;
+          margin-right: 16rpx;
+        }
+        .contact_default {
+          color: #f59a23;
+          font-size: 20rpx;
+          margin-left: 16rpx;
+          border: 1rpx solid #f59a23;
+        }
+        .contact_shop {
+          float: right;
+          font-size: 26rpx;
+          margin-right: 16rpx;
+        }
+      }
+      .contact_addr {
+        float: left;
+        width: 640rpx;
+        display: block;
+        font-size: 24rpx;
+        line-height: 30rpx;
+        padding: 10rpx 5rpx;
+      }
+    }
+  }
+  .create_box {
+    height: 140rpx;
+    display: block;
+    .create_addr {
+      width: 700rpx;
+      height: 80rpx;
+      display: block;
+      color: #ffffff;
+      font-size: 30rpx;
+      overflow: hidden;
+      line-height: 80rpx;
+      padding: 0rpx 0rpx;
+      text-align: center;
+      margin: 0rpx auto;
+      margin-top: 20rpx;
+      border-radius: 40rpx;
+      background-color: #e03519;
+    }
+  }
+}
 </style>

+ 8 - 8
pages/product/index.vue

@@ -79,7 +79,7 @@
 		</view>
 		<view class="order_car" v-if="productInfo.regiment_type === 2">
 			<navigator url="/pages/car/index" open-type="switchTab" class="to_car">
-				<image src="../../static/icon/car.png" class="car_icon"></image>
+				<image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/car.png" class="car_icon"></image>
 			</navigator>
 			<button class="show_order" data-eventsync="true"
 				@click="showSpecPopup(3)">{{this.productInfo.regiment_title}}专享/{{this.productInfo.regiment_price}}</button>
@@ -88,7 +88,7 @@
 		</view>
 		<view class="order_car" v-else-if="productInfo.regiment_type === 1">
 			<navigator url="/pages/car/index" open-type="switchTab" class="to_car">
-				<image src="../../static/icon/car.png" class="car_icon"></image>
+				<image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/car.png" class="car_icon"></image>
 			</navigator>
 			<view class="show_order_regiment" @click="showSpecPopup(4)">
 				<view>立即参与多人团拼单</view>
@@ -102,7 +102,7 @@
 		</view>
 		<view class="order_car" v-else>
 			<navigator url="/pages/car/index" open-type="switchTab" class="to_car">
-				<image src="../../static/icon/car.png" class="car_icon"></image>
+				<image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/car.png" class="car_icon"></image>
 			</navigator>
 			<button class="show_order" data-eventsync="true" @click="showSpecPopup(1)">立即预约</button>
 			<button class="show_car" data-eventsync="true" @click="showSpecPopup(2)">加入购物车</button>
@@ -143,12 +143,12 @@
 							</view>
 							<view class="product_quantity_box">
 								<button class="product_quantity_sub" @click="changeQuantity(-1)" data-eventsync="true">
-									<image class="sub_icon" src="../../static/icon/sub_icon.png" mode=""></image>
+									<image class="sub_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/sub_icon.png" mode=""></image>
 								</button>
 								<input type="number" class="product_quantity" placeholder="数量" v-model="quantity"
 									@blur="changeQuantity(0)"></input>
 								<button class="product_quantity_add" @click="changeQuantity(+1)" data-eventsync="true">
-									<image class="add_icon" src="../../static/icon/add_icon.png" mode=""></image>
+									<image class="add_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/add_icon.png" mode=""></image>
 								</button>
 							</view>
 						</view>
@@ -217,7 +217,7 @@
 							<view class="check_label">
 								<view class="isstd" v-if="!item.is_std">未达标</view>
 								<image class="checkbox" v-if="item.is_std"
-									:src="item.checked?'../../static/icon/checked.png':'../../static/icon/checkbox.png'">
+									:src="item.checked?'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checked.png':'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/checkbox.png'">
 								</image>
 							</view>
 						</view>
@@ -236,7 +236,7 @@
 				<view class="addr_item" v-for="(item,index) in addrList" :key="index" @click="checkedAddrItem(item)">
 					<view class="radio_label">
 						<image class="radio_icon"
-							:src="item.id == checkedAddr.id? '../../static/icon/radioed.png' : '../../static/icon/radio.png'">
+							:src="item.id == checkedAddr.id? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'">
 						</image>
 					</view>
 					<view class="contact_user">
@@ -424,7 +424,7 @@
 				// 判断数据
 				this.$http.request('api/custom/get_info').then((callback) => {
 					if (callback.code == 'success') {
-						if (!callback.data.userpic) callback.data.userpic = "../../static/icon/doctor.png";
+						if (!callback.data.userpic) callback.data.userpic = "https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/doctor.png";
 						// 存储登录标识
 						uni.setStorageSync('userInfo', callback.data);
 					}

+ 2 - 2
pages/redPacket/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="red_packet" catchtouchmove="true">
-    <image src="../../static/icon/red_packet_background.jpg" class="read_packet_background" />
+    <image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/red_packet_background.jpg" class="read_packet_background" />
     <view class="rule" @click="showRule">活动规则</view>
     <view class="get_content" v-if="!showReward">
       <view class="custom_button" @click="showRectangle"> 立即领取 </view>
@@ -18,7 +18,7 @@
       </view>
     </uni-popup>
     <div :class="['rectangle', { show: showReward }]">
-      <image src="../../static/icon/red_packet_bottom.png" class="read_packet_background" />
+      <image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/red_packet_bottom.png" class="read_packet_background" />
       <view class="text_content">
         <view> <text style="font-size: 50rpx; font-weight: bold">8.88 </text>元 </view>
         <view style="margin-top: 20rpx; color: #02a7f0" @click="_goWithdraw">已存入余额,去提现</view>

+ 1 - 1
pages/redPacket/list.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="red_packet_list">
     <view v-for="(packet, index) in redpackets" :key="packet.id" class="red_packet_item" :class="{ disabled: index == 0 }" @click="handleClick(packet)">
-      <img src="../../static/icon/packet_list_backerground.png" alt="" class="redpacket_background" />
+      <img src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/packet_list_backerground.png" alt="" class="redpacket_background" />
       <view class="packet_header">
         <view class="packet_image">福</view>
         <view class="packet_info">

+ 566 - 568
pages/score/clockin.vue

@@ -1,579 +1,577 @@
 <template>
-	<view>
-		<view class="main_view">
-			<view class="status_bar" :style="status_bar_style"><!-- 这里是状态栏 --></view>
-			<view class="info_box">
-				<view class="left_box">
-					<view class="score_info">
-						<view class="score_title">当前积分</view>
-						<view class="score_current">{{scoreInfo.score}} </view>
-					</view>
-					<view class="wait_info">
-						<view class="wait_title">待入账积分</view>
-						<view class="wait_score">{{scoreInfo.wait_score?scoreInfo.wait_score:0}}</view>
-					</view>
-				</view>
-				<view class="right_box">
-					<navigator url="/pages/score/lottery" class="lottery_enter">
-						<image class="lottery_img"
-							src="https://mall.findit.ltd/uploads/images/default/lottery_record.png" mode=""></image>
-						<view class="lottery_text">点我抽奖</view>
-					</navigator>
-				</view>
-			</view>
-			<view class="clockin_box" v-if="clockinList.length > 0">
-				<view class="box_title">
-					<view class="left_icon" v-if="(this.listKey>0)" @click="leftClockin()"><uni-icons type="left"
-							size="20"></uni-icons></view>
-					{{isMark.finish_day?'已连续签到 '+isMark.finish_day+' 天':'连续签到奖励更丰厚'}}
-					<view class="right_icon" v-if="(this.listKey<(this.listLength-1))" @click="rightClockin()">
-						<uni-icons type="right" size="20"></uni-icons></view>
-				</view>
-				<view class="clockin_list">
-					<view class="clockin_item" :class="item.is_finish?'acitve':''"
-						v-for="(item,index) in clockinList[listKey]" :key="index">
-						<view class="give_coupon" v-if="item['coupon_id']">券</view>
-						<view class="what_day">{{item.what_day}}</view>
-						<view class="score_one">
-							<image class="score_icon" src="../../static/icon/score.png" mode=""></image>
-						</view>
-						<!--						<view class="score_tow" v-if="index == 2 ||  index == 4">
-							<image class="score_icon" src="../../static/icon/score.png" mode=""></image>
-							<image class="score_icon" src="../../static/icon/score.png" mode=""></image>
+  <view>
+    <view class="main_view">
+      <view class="status_bar" :style="status_bar_style"><!-- 这里是状态栏 --></view>
+      <view class="info_box">
+        <view class="left_box">
+          <view class="score_info">
+            <view class="score_title">当前积分</view>
+            <view class="score_current">{{ scoreInfo.score }} </view>
+          </view>
+          <view class="wait_info">
+            <view class="wait_title">待入账积分</view>
+            <view class="wait_score">{{ scoreInfo.wait_score ? scoreInfo.wait_score : 0 }}</view>
+          </view>
+        </view>
+        <view class="right_box">
+          <navigator url="/pages/score/lottery" class="lottery_enter">
+            <image class="lottery_img" src="https://mall.findit.ltd/uploads/images/default/lottery_record.png" mode=""></image>
+            <view class="lottery_text">点我抽奖</view>
+          </navigator>
+        </view>
+      </view>
+      <view class="clockin_box" v-if="clockinList.length > 0">
+        <view class="box_title">
+          <view class="left_icon" v-if="this.listKey > 0" @click="leftClockin()"><uni-icons type="left" size="20"></uni-icons></view>
+          {{ isMark.finish_day ? "已连续签到 " + isMark.finish_day + " 天" : "连续签到奖励更丰厚" }}
+          <view class="right_icon" v-if="this.listKey < this.listLength - 1" @click="rightClockin()"> <uni-icons type="right" size="20"></uni-icons></view>
+        </view>
+        <view class="clockin_list">
+          <view class="clockin_item" :class="item.is_finish ? 'acitve' : ''" v-for="(item, index) in clockinList[listKey]" :key="index">
+            <view class="give_coupon" v-if="item['coupon_id']">券</view>
+            <view class="what_day">{{ item.what_day }}</view>
+            <view class="score_one">
+              <image class="score_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/score.png" mode=""></image>
+            </view>
+            <!--						<view class="score_tow" v-if="index == 2 ||  index == 4">
+							<image class="score_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/score.png" mode=""></image>
+							<image class="score_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/score.png" mode=""></image>
 						</view>-->
-						<view class="give_score">+{{item.reward}}</view>
-					</view>
-				</view>
-				<button class="clockin_btn" :class="isMark.is_clockin?'active':''"
-					@click="toClockin()">{{isMark.is_clockin?'已签到':'签到'}}</button>
-				<navigator url="/pages/score/record" class="score_record">积分记录 &gt;</navigator>
-				<button class="clockin_rule_btn" @click="showRule">活动规则 &gt;</button>
-			</view>
-			<view class="clockin_box" v-else>
-				<view class="box_title">
-					暂无签到活动
-				</view>
-				<navigator url="/pages/score/record" class="score_record">积分记录 &gt;</navigator>
-			</view>
-			<uni-popup ref="clockinRule" type="center">
-				<view class="clockin_rule_box">
-					<view class="clockin_rule_title">
-						<text>签到规则</text>
-						<view class="close_btn" @click="closeRule"> X </view>
-					</view>
-					<scroll-view class="clockin_rule_info" scroll-y="true" >
-						<rich-text :nodes="active_rule" class="rich_text"></rich-text>
-					</scroll-view>
-				</view>
-			</uni-popup>
-		</view>
-	</view>
+            <view class="give_score">+{{ item.reward }}</view>
+          </view>
+        </view>
+        <button class="clockin_btn" :class="isMark.is_clockin ? 'active' : ''" @click="toClockin()">{{ isMark.is_clockin ? "已签到" : "签到" }}</button>
+        <navigator url="/pages/score/record" class="score_record">积分记录 &gt;</navigator>
+        <button class="clockin_rule_btn" @click="showRule">活动规则 &gt;</button>
+      </view>
+      <view class="clockin_box" v-else>
+        <view class="box_title"> 暂无签到活动 </view>
+        <navigator url="/pages/score/record" class="score_record">积分记录 &gt;</navigator>
+      </view>
+      <uni-popup ref="clockinRule" type="center">
+        <view class="clockin_rule_box">
+          <view class="clockin_rule_title">
+            <text>签到规则</text>
+            <view class="close_btn" @click="closeRule"> X </view>
+          </view>
+          <scroll-view class="clockin_rule_info" scroll-y="true">
+            <rich-text :nodes="active_rule" class="rich_text"></rich-text>
+          </scroll-view>
+        </view>
+      </uni-popup>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				status_bar_style: {},
-				clockinList: [],
-				isMark: {
-					finish_day: 0,
-					is_clockin: 0,
-				},
-				scoreInfo: {
-					score: 0,
-					use_score: 0,
-					wait_score: 0,
-				},
-				isReqing: false,
-				listKey: 0,
-				listLength: 0,
-				active_id: 0,
-				active_rule: "",
-			}
-		},
-		onLoad() {
-			// #ifdef MP-WEIXIN
-			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-			this.status_bar_style = {
-				height: (menuButtonInfo.height) + "px",
-				"padding-top": menuButtonInfo.top + "px"
-			};
-			// #endif
-			// #ifdef MP-WEIXIN
-			//分享按钮
-			uni.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			})
-			// #endif
-		},
-		onShareAppMessage(obj) {
-			// 获取分享信息
-			let shareList 	= getApp().globalData.shareList;
-			// 获取分享信息
-			let shareObj	= {
-								title: '药优惠 得积分 兑豪礼',
-								path: '/pages/score/clockin',
-								imageUrl:'',
-							};
-			// 循环列表
-			for ( let i in shareList ) {
-				if( shareList[i].pages == 'pages/score/clockin' ) {
-					shareObj.path  = shareList[i].path ? shareList[i].path : shareObj.path ;
-					shareObj.title  = shareList[i].title ? shareList[i].title : shareObj.title ;
-					shareObj.imageUrl  = shareList[i].image_url ? shareList[i].image_url : shareObj.imageUrl ;
-				}
-			}
-			// 返回分享信息
-			return shareObj;
-		},
-		onShow() {
-			// 登录提示
-			if (!this.$checkAccess.alterLogin()) return;
-			// 请求打卡列表
-			this.getClockinList();
-			// 请求中,不允许刷新
-			if (this.isReqing) return;
-			// 设置请求中
-			this.isReqing = true;
-			// 请求列表
-			this.$http.request('/api/custom_score/get_info', this.requestParam).then((re) => {
-				// 设置非请求中
-				this.isReqing = false;
-				// 成功结果
-				if (re.code == 'success') {
-					this.scoreInfo = re.data;
-				}
-			});
-		},
-		methods: {
-			showRule(){
-				this.$refs.clockinRule.open('center')
-			},
-			closeRule(){
-				this.$refs.clockinRule.close();
-			},
-			toClockin() {
-				// 如果已经打卡
-				if (this.isMark.is_clockin) return;
-				// 登录提示
-				if (!this.$checkAccess.alterLogin()) return;
-				if (this.active_id === 0) {
-					uni.showToast({
-						title: '暂无活动',
-						icon: "none"
-					});
-				}
-				// 请求中,不允许刷新
-				if (this.isReqing) return;
-				// 设置请求中
-				this.isReqing = true;
-				// 请求列表
-				this.$http.request('api/score_clockin/finish', {
-					'active_id': this.active_id
-				}, 'post').then((re) => {
-					// 设置非请求中
-					this.isReqing = false;
-					// 成功结果
-					if (re.code == 'success') {
-						// 赋值
-						this.isMark = re.data;
-						// 积分更新
-						this.scoreInfo.score = re.data.reward + this.scoreInfo.score;
-						// 更新打卡
-						for (let i in this.clockinList[this.listKey]) {
-							// 如果小于等于连续打卡天数,设置为打卡
-							if (this.clockinList[this.listKey][i].what_day <= this.isMark.finish_day) this.clockinList[this.listKey][i].is_finish = 1;
-						}
-					} else {
-						uni.showToast({
-							title: '打卡失败',
-							icon: "none"
-
-						})
-					}
-				});
-			},
-			getClockinList() {
-				// 请求列表
-				this.$http.request('api/score_clockin/get_list', this.requestParam).then((re) => {
-					// 成功结果
-					if (re.code == 'success') {
-						// 赋值
-						this.clockinList 	= re.data.list;
-						this.listLength 	= this.clockinList.length;
-						this.active_id 		= re.data.active_id;
-						this.active_rule	= re.data.active_rule;
-						// 赋值
-						this.isMark = re.data.is_mark;
-					}
-				});
-			},
-			leftClockin() {
-				if (this.listKey > 0) {
-					this.listKey = this.listKey - 1
-				}
-			},
-			rightClockin() {
-				this.listKey = this.listKey + 1
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      status_bar_style: {},
+      clockinList: [],
+      isMark: {
+        finish_day: 0,
+        is_clockin: 0,
+      },
+      scoreInfo: {
+        score: 0,
+        use_score: 0,
+        wait_score: 0,
+      },
+      isReqing: false,
+      listKey: 0,
+      listLength: 0,
+      active_id: 0,
+      active_rule: "",
+    };
+  },
+  onLoad() {
+    // #ifdef MP-WEIXIN
+    let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+    this.status_bar_style = {
+      height: menuButtonInfo.height + "px",
+      "padding-top": menuButtonInfo.top + "px",
+    };
+    // #endif
+    // #ifdef MP-WEIXIN
+    //分享按钮
+    uni.showShareMenu({
+      withShareTicket: true,
+      menus: ["shareAppMessage", "shareTimeline"],
+    });
+    // #endif
+  },
+  onShareAppMessage(obj) {
+    // 获取分享信息
+    let shareList = getApp().globalData.shareList;
+    // 获取分享信息
+    let shareObj = {
+      title: "药优惠 得积分 兑豪礼",
+      path: "/pages/score/clockin",
+      imageUrl: "",
+    };
+    // 循环列表
+    for (let i in shareList) {
+      if (shareList[i].pages == "pages/score/clockin") {
+        shareObj.path = shareList[i].path ? shareList[i].path : shareObj.path;
+        shareObj.title = shareList[i].title ? shareList[i].title : shareObj.title;
+        shareObj.imageUrl = shareList[i].image_url ? shareList[i].image_url : shareObj.imageUrl;
+      }
+    }
+    // 返回分享信息
+    return shareObj;
+  },
+  onShow() {
+    // 登录提示
+    if (!this.$checkAccess.alterLogin()) return;
+    // 请求打卡列表
+    this.getClockinList();
+    // 请求中,不允许刷新
+    if (this.isReqing) return;
+    // 设置请求中
+    this.isReqing = true;
+    // 请求列表
+    this.$http.request("/api/custom_score/get_info", this.requestParam).then((re) => {
+      // 设置非请求中
+      this.isReqing = false;
+      // 成功结果
+      if (re.code == "success") {
+        this.scoreInfo = re.data;
+      }
+    });
+  },
+  methods: {
+    showRule() {
+      this.$refs.clockinRule.open("center");
+    },
+    closeRule() {
+      this.$refs.clockinRule.close();
+    },
+    toClockin() {
+      // 如果已经打卡
+      if (this.isMark.is_clockin) return;
+      // 登录提示
+      if (!this.$checkAccess.alterLogin()) return;
+      if (this.active_id === 0) {
+        uni.showToast({
+          title: "暂无活动",
+          icon: "none",
+        });
+      }
+      // 请求中,不允许刷新
+      if (this.isReqing) return;
+      // 设置请求中
+      this.isReqing = true;
+      // 请求列表
+      this.$http
+        .request(
+          "api/score_clockin/finish",
+          {
+            active_id: this.active_id,
+          },
+          "post"
+        )
+        .then((re) => {
+          // 设置非请求中
+          this.isReqing = false;
+          // 成功结果
+          if (re.code == "success") {
+            // 赋值
+            this.isMark = re.data;
+            // 积分更新
+            this.scoreInfo.score = re.data.reward + this.scoreInfo.score;
+            // 更新打卡
+            for (let i in this.clockinList[this.listKey]) {
+              // 如果小于等于连续打卡天数,设置为打卡
+              if (this.clockinList[this.listKey][i].what_day <= this.isMark.finish_day) this.clockinList[this.listKey][i].is_finish = 1;
+            }
+          } else {
+            uni.showToast({
+              title: "打卡失败",
+              icon: "none",
+            });
+          }
+        });
+    },
+    getClockinList() {
+      // 请求列表
+      this.$http.request("api/score_clockin/get_list", this.requestParam).then((re) => {
+        // 成功结果
+        if (re.code == "success") {
+          // 赋值
+          this.clockinList = re.data.list;
+          this.listLength = this.clockinList.length;
+          this.active_id = re.data.active_id;
+          this.active_rule = re.data.active_rule;
+          // 赋值
+          this.isMark = re.data.is_mark;
+        }
+      });
+    },
+    leftClockin() {
+      if (this.listKey > 0) {
+        this.listKey = this.listKey - 1;
+      }
+    },
+    rightClockin() {
+      this.listKey = this.listKey + 1;
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	page {
-		background-color: #FFFFFF;
-	}
-	.main_view {
-		display: block;
-		height: 1000rpx;
-		background: linear-gradient(to bottom, #FC335F 0%, #FB7224 50%, #FFFFFF 100%);
-
-		.status_bar {
-			width: 100%;
-			height: 64rpx;
-			display: block;
-			padding-top: var(--status-bar-height);
-		}
-
-		.info_box {
-			display: block;
-			overflow: hidden;
-
-			.left_box {
-				float: left;
-				width: 450rpx;
-
-				.score_info {
-					color: #FFFFFF;
-					overflow: hidden;
-					padding: 0rpx 35rpx;
-
-					.score_title {
-						width: 240rpx;
-						height: 60rpx;
-						display: block;
-						font-size: 26rpx;
-						line-height: 60rpx;
-					}
-
-					.score_current {
-						width: 240rpx;
-						height: 80rpx;
-						display: block;
-						font-size: 66rpx;
-						line-height: 80rpx;
-					}
-				}
-
-				.wait_info {
-					color: #FFFFFF;
-					display: block;
-					overflow: hidden;
-					padding: 0rpx 35rpx;
-					margin-top: 20rpx;
-
-					.wait_title {
-						width: 240rpx;
-						height: 40rpx;
-						display: block;
-						font-size: 24rpx;
-						line-height: 40rpx;
-					}
-
-					.wait_score {
-						width: 240rpx;
-						height: 60rpx;
-						display: block;
-						font-size: 36rpx;
-						line-height: 60rpx;
-					}
-				}
-			}
-
-			.right_box {
-				float: right;
-				overflow: hidden;
-				margin-top: 60rpx;
-				margin-right: 35rpx;
-
-				.lottery_enter {
-					display: block;
-					overflow: hidden;
-					text-align: center;
-
-					.lottery_img {
-						width: 150rpx;
-						height: 150rpx;
-						display: block;
-						margin: 0 auto;
-					}
-
-					.lottery_text {
-						color: #FFFFFF;
-						height: 60rpx;
-						font-size: 28rpx;
-						line-height: 60rpx;
-					}
-				}
-			}
-		}
-
-		.clockin_box {
-			z-index: 9;
-			display: block;
-			width: 700rpx;
-			margin: 0rpx auto;
-			position: relative;
-			border-radius: 40rpx;
-			background-color: #FFFFFF;
-			box-shadow: 5rpx 5rpx 2rpx 0rpx #DDDDDD;
-
-			.box_title {
-				height: 80rpx;
-				color: #999999;
-				text-align: center;
-				line-height: 80rpx;
-
-				.left_icon {
-					float: left;
-					padding-left: 20rpx;
-				}
-
-				.right_icon {
-					float: right;
-					padding-right: 20rpx;
-				}
-			}
-
-			.clockin_list {
-				display: block;
-				overflow: hidden;
-				width: 100%;
-				padding-top: 25rpx;
-
-				.clockin_item {
-					float: left;
-					position: relative;
-					width: 70rpx;
-					height: 165rpx;
-					text-align: center;
-					margin-left: 25rpx;
-					border-radius: 20rpx;
-					margin-bottom: 20rpx;
-					background-color: #F8F8F8;
-
-					.what_day {
-						display: block;
-						height: 40rpx;
-						font-size: 24rpx;
-						line-height: 60rpx;
-					}
-
-					.score_one {
-						display: block;
-						height: 60rpx;
-						margin: 10rpx auto;
-						position: relative;
-
-						.score_icon {
-							display: block;
-							width: 60rpx;
-							height: 60rpx;
-							margin: 0rpx auto;
-						}
-					}
-
-					.score_tow {
-						display: block;
-						height: 80rpx;
-						margin: 10rpx auto;
-						position: relative;
-
-						.score_icon {
-							display: block;
-							width: 80rpx;
-							height: 80rpx;
-							margin: 0rpx auto;
-						}
-
-						.score_icon:nth-child(1) {
-							top: 0rpx;
-							left: 10rpx;
-							width: 80rpx;
-							height: 80rpx;
-							position: absolute;
-						}
-
-						.score_icon:nth-child(2) {
-							top: 0rpx;
-							left: 55rpx;
-							width: 80rpx;
-							height: 80rpx;
-							position: absolute;
-						}
-					}
-
-					.score_the {
-						width: 200rpx;
-						display: block;
-						height: 100rpx;
-						margin: 10rpx auto;
-						position: relative;
-
-						.score_icon {
-							display: block;
-							width: 80rpx;
-							height: 80rpx;
-							margin: 0rpx auto;
-						}
-
-						.score_icon:nth-child(1) {
-							top: 15rpx;
-							left: 20rpx;
-							width: 80rpx;
-							height: 80rpx;
-							position: absolute;
-						}
-
-						.score_icon:nth-child(2) {
-							top: 15rpx;
-							left: 95rpx;
-							width: 80rpx;
-							height: 80rpx;
-							position: absolute;
-						}
-
-						.score_icon:nth-child(3) {
-							top: 0rpx;
-							left: 60rpx;
-							width: 80rpx;
-							height: 80rpx;
-							position: absolute;
-						}
-					}
-
-					.give_score {
-						display: block;
-						height: 30rpx;
-						font-size: 24rpx;
-						line-height: 40rpx;
-					}
-
-					.give_coupon {
-						position: absolute;
-						font-size: 20rpx;
-						padding: 2px 5px;
-						background-color: #f00;
-						color: #fff;
-						border-radius: 6px;
-						display: inline-block;
-						text-align: center;
-						right: -15rpx;
-						top: -15rpx;
-					}
-				}
-
-				/*.clockin_item:nth-child(7){
+page {
+  background-color: #ffffff;
+}
+.main_view {
+  display: block;
+  height: 1000rpx;
+  background: linear-gradient(to bottom, #fc335f 0%, #fb7224 50%, #ffffff 100%);
+
+  .status_bar {
+    width: 100%;
+    height: 64rpx;
+    display: block;
+    padding-top: var(--status-bar-height);
+  }
+
+  .info_box {
+    display: block;
+    overflow: hidden;
+
+    .left_box {
+      float: left;
+      width: 450rpx;
+
+      .score_info {
+        color: #ffffff;
+        overflow: hidden;
+        padding: 0rpx 35rpx;
+
+        .score_title {
+          width: 240rpx;
+          height: 60rpx;
+          display: block;
+          font-size: 26rpx;
+          line-height: 60rpx;
+        }
+
+        .score_current {
+          width: 240rpx;
+          height: 80rpx;
+          display: block;
+          font-size: 66rpx;
+          line-height: 80rpx;
+        }
+      }
+
+      .wait_info {
+        color: #ffffff;
+        display: block;
+        overflow: hidden;
+        padding: 0rpx 35rpx;
+        margin-top: 20rpx;
+
+        .wait_title {
+          width: 240rpx;
+          height: 40rpx;
+          display: block;
+          font-size: 24rpx;
+          line-height: 40rpx;
+        }
+
+        .wait_score {
+          width: 240rpx;
+          height: 60rpx;
+          display: block;
+          font-size: 36rpx;
+          line-height: 60rpx;
+        }
+      }
+    }
+
+    .right_box {
+      float: right;
+      overflow: hidden;
+      margin-top: 60rpx;
+      margin-right: 35rpx;
+
+      .lottery_enter {
+        display: block;
+        overflow: hidden;
+        text-align: center;
+
+        .lottery_img {
+          width: 150rpx;
+          height: 150rpx;
+          display: block;
+          margin: 0 auto;
+        }
+
+        .lottery_text {
+          color: #ffffff;
+          height: 60rpx;
+          font-size: 28rpx;
+          line-height: 60rpx;
+        }
+      }
+    }
+  }
+
+  .clockin_box {
+    z-index: 9;
+    display: block;
+    width: 700rpx;
+    margin: 0rpx auto;
+    position: relative;
+    border-radius: 40rpx;
+    background-color: #ffffff;
+    box-shadow: 5rpx 5rpx 2rpx 0rpx #dddddd;
+
+    .box_title {
+      height: 80rpx;
+      color: #999999;
+      text-align: center;
+      line-height: 80rpx;
+
+      .left_icon {
+        float: left;
+        padding-left: 20rpx;
+      }
+
+      .right_icon {
+        float: right;
+        padding-right: 20rpx;
+      }
+    }
+
+    .clockin_list {
+      display: block;
+      overflow: hidden;
+      width: 100%;
+      padding-top: 25rpx;
+
+      .clockin_item {
+        float: left;
+        position: relative;
+        width: 70rpx;
+        height: 165rpx;
+        text-align: center;
+        margin-left: 25rpx;
+        border-radius: 20rpx;
+        margin-bottom: 20rpx;
+        background-color: #f8f8f8;
+
+        .what_day {
+          display: block;
+          height: 40rpx;
+          font-size: 24rpx;
+          line-height: 60rpx;
+        }
+
+        .score_one {
+          display: block;
+          height: 60rpx;
+          margin: 10rpx auto;
+          position: relative;
+
+          .score_icon {
+            display: block;
+            width: 60rpx;
+            height: 60rpx;
+            margin: 0rpx auto;
+          }
+        }
+
+        .score_tow {
+          display: block;
+          height: 80rpx;
+          margin: 10rpx auto;
+          position: relative;
+
+          .score_icon {
+            display: block;
+            width: 80rpx;
+            height: 80rpx;
+            margin: 0rpx auto;
+          }
+
+          .score_icon:nth-child(1) {
+            top: 0rpx;
+            left: 10rpx;
+            width: 80rpx;
+            height: 80rpx;
+            position: absolute;
+          }
+
+          .score_icon:nth-child(2) {
+            top: 0rpx;
+            left: 55rpx;
+            width: 80rpx;
+            height: 80rpx;
+            position: absolute;
+          }
+        }
+
+        .score_the {
+          width: 200rpx;
+          display: block;
+          height: 100rpx;
+          margin: 10rpx auto;
+          position: relative;
+
+          .score_icon {
+            display: block;
+            width: 80rpx;
+            height: 80rpx;
+            margin: 0rpx auto;
+          }
+
+          .score_icon:nth-child(1) {
+            top: 15rpx;
+            left: 20rpx;
+            width: 80rpx;
+            height: 80rpx;
+            position: absolute;
+          }
+
+          .score_icon:nth-child(2) {
+            top: 15rpx;
+            left: 95rpx;
+            width: 80rpx;
+            height: 80rpx;
+            position: absolute;
+          }
+
+          .score_icon:nth-child(3) {
+            top: 0rpx;
+            left: 60rpx;
+            width: 80rpx;
+            height: 80rpx;
+            position: absolute;
+          }
+        }
+
+        .give_score {
+          display: block;
+          height: 30rpx;
+          font-size: 24rpx;
+          line-height: 40rpx;
+        }
+
+        .give_coupon {
+          position: absolute;
+          font-size: 20rpx;
+          padding: 2px 5px;
+          background-color: #f00;
+          color: #fff;
+          border-radius: 6px;
+          display: inline-block;
+          text-align: center;
+          right: -15rpx;
+          top: -15rpx;
+        }
+      }
+
+      /*.clockin_item:nth-child(7){
 					width: 315rpx;
 				}*/
-				.clockin_item.acitve {
-					color: #FFFFFF;
-					background-color: #E03519;
-				}
-			}
-
-			.clockin_btn {
-				width: 660rpx;
-				color: #FFFFFF;
-				font-size: 30rpx;
-				margin-top: 20rpx;
-				padding: 0rpx 0rpx;
-				border-radius: 60rpx;
-				background-color: #E03519;
-				border: 0rpx solid transparent;
-			}
-
-			.clockin_btn.active {
-				color: #FFFFFF;
-				background-color: #AAAAAA;
-			}
-
-			.clockin_btn::after {
-				border: 0rpx solid transparent;
-			}
-
-			.score_record {
-				height: 60rpx;
-				display: block;
-				color: #999999;
-				font-size: 24rpx;
-				margin-top: 20rpx;
-				text-align: center;
-				line-height: 80rpx;
-			}
-			
-			.clockin_rule_btn{
-				color: #999999;
-				overflow: hidden;
-				font-size: 24rpx;
-				text-align: center;
-				line-height: 80rpx;
-				padding: 0rpx 0rpx;
-				background: transparent;
-			}
-			.clockin_rule_btn::after{
-				border: 0rpx solid transparent;
-			}
-		}
-	}
-	.popup{
-		overflow: hidden;
-	}
-	.clockin_rule_box{
-		width: 500rpx;
-		display: block;
-		overflow: hidden;
-		background: #FFFFFF;
-		font-size: 26rpx;
-		margin: 0rpx auto;
-		line-height: 50rpx;
-		border-radius: 10rpx;
-		padding: 0rpx 25rpx;
-		padding-bottom: 20rpx;
-		background: linear-gradient(to bottom, #FC335F 0%, #FB7224 100%);
-		.clockin_rule_title{
-			color: #FFFFFF;
-			height: 60rpx;
-			font-size: 32rpx;
-			line-height: 60rpx;
-			text-align: center;
-			margin-bottom: 10rpx;
-			.close_btn{
-				float: right;
-				width: 40rpx;
-				height: 40rpx;
-				font-size: 24rpx;
-				margin-top: 9rpx;
-				line-height: 40rpx;
-				border-radius: 50%;
-				border: 1rpx solid #FFFFFF;
-			}
-		}
-		.clockin_rule_info{
-			display: block;
-			height: 500rpx;
-			font-size: 24rpx;
-			line-height: 40rpx;
-			border-radius: 10rpx;
-			padding: 20rpx 20rpx;
-			box-sizing: border-box;
-			background-color: #FFFFFF;
-			.rich_text{
-				white-space: break-spaces;
-			}
-		}
-	}
+      .clockin_item.acitve {
+        color: #ffffff;
+        background-color: #e03519;
+      }
+    }
+
+    .clockin_btn {
+      width: 660rpx;
+      color: #ffffff;
+      font-size: 30rpx;
+      margin-top: 20rpx;
+      padding: 0rpx 0rpx;
+      border-radius: 60rpx;
+      background-color: #e03519;
+      border: 0rpx solid transparent;
+    }
+
+    .clockin_btn.active {
+      color: #ffffff;
+      background-color: #aaaaaa;
+    }
+
+    .clockin_btn::after {
+      border: 0rpx solid transparent;
+    }
+
+    .score_record {
+      height: 60rpx;
+      display: block;
+      color: #999999;
+      font-size: 24rpx;
+      margin-top: 20rpx;
+      text-align: center;
+      line-height: 80rpx;
+    }
+
+    .clockin_rule_btn {
+      color: #999999;
+      overflow: hidden;
+      font-size: 24rpx;
+      text-align: center;
+      line-height: 80rpx;
+      padding: 0rpx 0rpx;
+      background: transparent;
+    }
+    .clockin_rule_btn::after {
+      border: 0rpx solid transparent;
+    }
+  }
+}
+.popup {
+  overflow: hidden;
+}
+.clockin_rule_box {
+  width: 500rpx;
+  display: block;
+  overflow: hidden;
+  background: #ffffff;
+  font-size: 26rpx;
+  margin: 0rpx auto;
+  line-height: 50rpx;
+  border-radius: 10rpx;
+  padding: 0rpx 25rpx;
+  padding-bottom: 20rpx;
+  background: linear-gradient(to bottom, #fc335f 0%, #fb7224 100%);
+  .clockin_rule_title {
+    color: #ffffff;
+    height: 60rpx;
+    font-size: 32rpx;
+    line-height: 60rpx;
+    text-align: center;
+    margin-bottom: 10rpx;
+    .close_btn {
+      float: right;
+      width: 40rpx;
+      height: 40rpx;
+      font-size: 24rpx;
+      margin-top: 9rpx;
+      line-height: 40rpx;
+      border-radius: 50%;
+      border: 1rpx solid #ffffff;
+    }
+  }
+  .clockin_rule_info {
+    display: block;
+    height: 500rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    border-radius: 10rpx;
+    padding: 20rpx 20rpx;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    .rich_text {
+      white-space: break-spaces;
+    }
+  }
+}
 </style>

+ 635 - 625
pages/score/lottery.vue

@@ -1,633 +1,643 @@
 <template>
-	<view>
-		<view class="lottery_box" :style="height">
-			<view class="lottery_time" v-if="lotteryInfo.id">活动时间:{{lotteryInfo.start_date}} ~ {{lotteryInfo.end_date}}</view>
-			<view class="lottery_info">
-				<image class="lottery_logo" v-if="lotteryInfo.logo" :src="lotteryInfo.logo" mode="widthFix"></image>
-				<button class="lottery_rule_btn" @click="showRule">活动规则</button>
-			</view>
-			<l-dialer :customStyle="'width: 500rpx;height: 500rpx;margin: 0rpx auto;'" @click="onClick" dial-style="color: rgba(60,48,158,0.7); padding: 32rpx;background-image: url(https://mall.findit.ltd/uploads/images/default/lottery_bg.png)" :prizeList="prizeList" :turns="5" :duration="5" @done="onDone" ref="dialer" />
-			<view class="record_box">
-				<view class="score_info">
-					<view class="custom_score">当前积分:{{scoreInfo.score}}</view>
-					<view class="need_score" v-if="lotteryInfo.id" >每次抽奖消耗{{lotteryInfo.need_score}}积分</view>
-					<view class="need_score" v-if="!lotteryInfo.id" >暂无可参与的活动</view>
-				</view>
-				<button class="lottery_record" @click="showRecord" v-if="lotteryInfo.id">
-					<image class="lottery_record_img" src="https://mall.findit.ltd/uploads/images/default/lottery_record.png" mode=""></image>
-					<text class="lottery_record_text">中奖记录</text>
-				</button>
-			</view>
-		</view>
-		<uni-popup ref="lotteryRule" type="center">
-			<view class="lottery_rule_box">
-				<view class="lottery_rule_title">
-					<text>活动规则</text>
-					<view class="close_btn" @click="closeRule"> X </view>
-				</view>
-				<scroll-view class="lottery_rule_info" scroll-y="true" >
-					<rich-text :nodes="lotteryInfo.rule" class="rich_text"></rich-text>
-				</scroll-view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="lotteryRecord" type="bottom">
-			<view class="lottery_record_box">
-				<view class="lottery_record_title">
-					<text>我的奖品</text>
-					<view class="close_btn" @click="closeRecord"> X </view>
-				</view>
-				<view class="lottery_record_none" v-if="!recordList.length">这里还是空的哦~</view>
-				<scroll-view class="lottery_record_list" scroll-y="true" >
-					<view class="lottery_record_item" v-for="(item,index) in recordList" :key="index">
-						<view class="reward_time">{{item.insert_time}}</view>
-						<view class="reward_name">{{item.reward_name}}</view>
-						<view class="reward_state" v-if="item.status">{{item.state}}</view>
-						<view class="reward_state" v-if="!item.status" @click="openAddr(index)">{{item.state}}</view>
-					</view>
-				</scroll-view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="addrPopup" type="bottom" class="popup" background-color="#FFFFFF" >
-			<view class="popup_title">收货地址 <navigator url="/pages/addr/index?notify=addr" class="to_addr_page">管理</navigator> </view>
-			<view class="addr_list">
-				<view class="addr_item" v-for="(item,index) in addrList" :key="index" @click="checkedAddrItem(item)">
-					<view class="radio_label">
-						<image class="radio_icon" :src="item.id == checkedAddr.id? '../../static/icon/radioed.png' : '../../static/icon/radio.png'" ></image> 
-					</view>
-					<view class="contact_user">
-						<text class="contact_name">{{item.contact_name}}</text>
-						<text class="contact_phone">{{item.contact_phone}}</text>
-						<text class="contact_default" v-if="item.is_default">默认</text>
-						<text class="contact_shop">{{item.contact_shop}}</text>
-					</view>
-					<view class="contact_addr">
-						{{item.contact_province}} {{item.contact_city}} {{item.contact_area}} {{item.contact_addr}}
-					</view>
-				</view>
-			</view>
-			<view class="create_box">
-				<navigator url="/pages/addr/index?notify=addr&type=create" class="create_addr"  >新建收货地址</navigator>
-			</view>
-		</uni-popup>
-	</view>
+  <view>
+    <view class="lottery_box" :style="height">
+      <view class="lottery_time" v-if="lotteryInfo.id">活动时间:{{ lotteryInfo.start_date }} ~ {{ lotteryInfo.end_date }}</view>
+      <view class="lottery_info">
+        <image class="lottery_logo" v-if="lotteryInfo.logo" :src="lotteryInfo.logo" mode="widthFix"></image>
+        <button class="lottery_rule_btn" @click="showRule">活动规则</button>
+      </view>
+      <l-dialer
+        :customStyle="'width: 500rpx;height: 500rpx;margin: 0rpx auto;'"
+        @click="onClick"
+        dial-style="color: rgba(60,48,158,0.7); padding: 32rpx;background-image: url(https://mall.findit.ltd/uploads/images/default/lottery_bg.png)"
+        :prizeList="prizeList"
+        :turns="5"
+        :duration="5"
+        @done="onDone"
+        ref="dialer"
+      />
+      <view class="record_box">
+        <view class="score_info">
+          <view class="custom_score">当前积分:{{ scoreInfo.score }}</view>
+          <view class="need_score" v-if="lotteryInfo.id">每次抽奖消耗{{ lotteryInfo.need_score }}积分</view>
+          <view class="need_score" v-if="!lotteryInfo.id">暂无可参与的活动</view>
+        </view>
+        <button class="lottery_record" @click="showRecord" v-if="lotteryInfo.id">
+          <image class="lottery_record_img" src="https://mall.findit.ltd/uploads/images/default/lottery_record.png" mode=""></image>
+          <text class="lottery_record_text">中奖记录</text>
+        </button>
+      </view>
+    </view>
+    <uni-popup ref="lotteryRule" type="center">
+      <view class="lottery_rule_box">
+        <view class="lottery_rule_title">
+          <text>活动规则</text>
+          <view class="close_btn" @click="closeRule"> X </view>
+        </view>
+        <scroll-view class="lottery_rule_info" scroll-y="true">
+          <rich-text :nodes="lotteryInfo.rule" class="rich_text"></rich-text>
+        </scroll-view>
+      </view>
+    </uni-popup>
+    <uni-popup ref="lotteryRecord" type="bottom">
+      <view class="lottery_record_box">
+        <view class="lottery_record_title">
+          <text>我的奖品</text>
+          <view class="close_btn" @click="closeRecord"> X </view>
+        </view>
+        <view class="lottery_record_none" v-if="!recordList.length">这里还是空的哦~</view>
+        <scroll-view class="lottery_record_list" scroll-y="true">
+          <view class="lottery_record_item" v-for="(item, index) in recordList" :key="index">
+            <view class="reward_time">{{ item.insert_time }}</view>
+            <view class="reward_name">{{ item.reward_name }}</view>
+            <view class="reward_state" v-if="item.status">{{ item.state }}</view>
+            <view class="reward_state" v-if="!item.status" @click="openAddr(index)">{{ item.state }}</view>
+          </view>
+        </scroll-view>
+      </view>
+    </uni-popup>
+    <uni-popup ref="addrPopup" type="bottom" class="popup" background-color="#FFFFFF">
+      <view class="popup_title">收货地址 <navigator url="/pages/addr/index?notify=addr" class="to_addr_page">管理</navigator> </view>
+      <view class="addr_list">
+        <view class="addr_item" v-for="(item, index) in addrList" :key="index" @click="checkedAddrItem(item)">
+          <view class="radio_label">
+            <image
+              class="radio_icon"
+              :src="item.id == checkedAddr.id ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'"
+            ></image>
+          </view>
+          <view class="contact_user">
+            <text class="contact_name">{{ item.contact_name }}</text>
+            <text class="contact_phone">{{ item.contact_phone }}</text>
+            <text class="contact_default" v-if="item.is_default">默认</text>
+            <text class="contact_shop">{{ item.contact_shop }}</text>
+          </view>
+          <view class="contact_addr"> {{ item.contact_province }} {{ item.contact_city }} {{ item.contact_area }} {{ item.contact_addr }} </view>
+        </view>
+      </view>
+      <view class="create_box">
+        <navigator url="/pages/addr/index?notify=addr&type=create" class="create_addr">新建收货地址</navigator>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				height:"",
-				// 奖项列表,
-				prizeList: [],
-				// 中奖记录
-				recordList: [],
-				// 地址列表
-				addrList:[],
-				// 抽奖信息
-				lotteryInfo:{
-					id:0,
-					name:"",
-					logo:"",
-					need_score:"",
-					start_date:"",
-					end_date:"",
-					start_time:"",
-					end_time:"",
-					rule:"",
-				},
-				// 积分信息
-				scoreInfo:{
-					score:0,
-					use_score:0,
-					wait_score:0,
-				},
-				// 更新积分信息
-				newScore:{
-					score:0,
-					use_score:0,
-					wait_score:0,
-				},
-				recordId:0,
-			}
-		},
-		onLoad() {
-			// 窗口信息
-			var sysinfo = uni.getWindowInfo();
-			// 获取屏幕可用高度
-			this.height = 'height:'+sysinfo.windowHeight + 'px;';
-			// 监听地址变动
-			uni.$on('addr_list_change',data=>{
-				// 地址列表
-				this.addrList = data.list;
-			});
-			// #ifdef MP-WEIXIN
-			//分享按钮
-			uni.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			})
-			// #endif
-		},
-		onShareAppMessage(obj) {
-			// 获取分享信息
-			let shareList 	= getApp().globalData.shareList;
-			// 获取分享信息
-			let shareObj	= {
-								title: '药优惠 得积分 兑豪礼',
-								path: '/pages/score/lottery',
-								imageUrl:'',
-							};
-			// 循环列表
-			for ( let i in shareList ) {
-				if( shareList[i].pages == 'pages/score/lottery' ) {
-					shareObj.path  = shareList[i].path ? shareList[i].path : shareObj.path ;
-					shareObj.title  = shareList[i].title ? shareList[i].title : shareObj.title ;
-					shareObj.imageUrl  = shareList[i].image_url ? shareList[i].image_url : shareObj.imageUrl ;
-				}
-			}
-			// 返回分享信息
-			return shareObj;
-		},
-		onShow() {
-			// 没有数据的话,或者请求中,不允许刷新
-			if( this.isReqing )		return ;
-			// 登录提示
-			if( !this.$checkAccess.alterLogin() )  return ;
-			// 设置请求中
-			this.isReqing			= true;
-			// 请求
-			this.$http.request('api/lottery_score/get_detail').then((re)=>{
-				// 设置非请求中
-				this.isReqing		= false;
-				// 成功结果
-				if( re.code == 'success' ){
-					this.lotteryInfo	= re.data;
-					this.prizeList 		= re.data.reward_list;
-				}
-			});
-			// 请求列表
-			this.$http.request('/api/custom_score/get_info',{}).then((re)=>{
-				// 设置非请求中
-				this.isReqing		= false;
-				// 成功结果
-				if( re.code == 'success' ){
-					this.scoreInfo	= re.data;
-					this.newScore   = re.data;
-				}
-			});
-		},
-		methods: {
-			onDone(index) {
-				// 奖项
-				let prize = this.prizeList[index];
-				// 如果是实物
-				this.scoreInfo = this.newScore;
-				uni.showModal({
-					title: prize.id == 0 ? '很遗憾': '恭喜您',
-					content: (prize.id != 0 ? `获得`:'') + prize.name + (prize.reward_type == 5 ? ',请在中奖记录中填写收货地址':''),
-					showCancel:false,
-					success: (re) => {
-						if( re.confirm && prize.reward_type == 5){
-							// 显示中奖列表
-							this.showRecord();
-						}
-					}
-				});
-			},
-			onClick() {
-				// 活动是否开始
-				if( !this.lotteryInfo.id ){
-					uni.showToast({
-						title:"暂无可参与活动",
-						icon:"none",
-					})
-					return;
-				}
-				// 活动是否开始
-				if( this.lotteryInfo.start_time * 1000 > new Date().getTime() ){
-					uni.showToast({
-						title:"活动还没开始哦",
-						icon:"none",
-					})
-					return;
-				}
-				// 活动是否结束
-				if( this.lotteryInfo.end_time * 1000 <= new Date().getTime() ){
-					uni.showToast({
-						title:"活动已结束了哦",
-						icon:"none",
-					})
-					return;
-				}
-				// 积分不足
-				if( this.scoreInfo.score < this.lotteryInfo.need_score ){
-					uni.showToast({
-						title:"积分不足",
-						icon:"none",
-					})
-					return;
-				}
-				// 积分操作
-				this.scoreInfo.score    = this.scoreInfo.score - this.lotteryInfo.need_score;
-				// 请求列表
-				this.$http.request('/api/lottery_score/get_reward',{lottery_id:this.lotteryInfo.id}).then((re)=>{
-					// 设置非请求中
-					this.isReqing		= false;
-					// 成功结果
-					if( re.code == 'success' ){
-						// 奖品列表更新
-						this.prizeList	= re.data.reward_list;
-						this.newScore	= re.data.custom_score;
-						// 奖品的索引
-						return 			this.$refs.dialer.run(re.data.reward_index);
-					}else{
-						uni.showToast({
-							title:re.msg,
-							icon:"none",
-						})
-						// 积分操作
-						this.scoreInfo.score    = this.scoreInfo.score + this.lotteryInfo.need_score;
-						return ;
-					}
-				});
-			},
-			showRule(){
-				this.$refs.lotteryRule.open('center')
-			},
-			closeRule(){
-				this.$refs.lotteryRule.close();
-			},
-			showRecord(){
-				// 活动是否开始
-				if( this.lotteryInfo.id ){
-					// 请求列表
-					this.$http.request('/api/lottery_score_record/get_list',{lottery_id:this.lotteryInfo.id}).then((re)=>{
-						// 设置非请求中
-						this.isReqing		= false;
-						// 成功结果
-						if( re.code == 'success' ){
-							this.recordList	= re.data;
-						}
-					});
-				}
-				this.$refs.lotteryRecord.open('bottom');
-			},
-			closeRecord(){
-				this.$refs.lotteryRecord.close();
-			},
-			openAddr(index){
-				// 选择的下标
-				this.recordIndex = index;
-				// 地址列表
-				this.getAddrList(true);
-			},
-			// 选择地址
-			checkedAddrItem(item){
-				// 判断数据
-				this.$http.request('api/lottery_score_record/set_addr',{id:this.recordList[this.recordIndex].id,addr_id:item.id},'post').then((callback)=>{
-					// 获取成功
-					if( callback.code == 'success' ){
-						this.recordList[this.recordIndex].status = 1;
-						this.recordList[this.recordIndex].state  = '进行中';
-					}
-					this.$refs.addrPopup.close();
-				});
-			},
-			getAddrList(showPopup=false){
-				// 判断数据
-				this.$http.request('api/custom_addr/get_list').then((callback)=>{
-					// 获取成功
-					if( callback.code == 'success' ){
-						this.addrList  = callback.data;
-						// 如果有的话
-						if( this.addrList.length ){
-							// 获取默认的
-							for (let i in this.addrList) {
-								// 如果是默认的
-								if( this.addrList[i].is_default ) this.checkedAddr = this.addrList[i];
-							}
-							// 如果没有默认的话
-							if( !this.checkedAddr.id ){
-								this.checkedAddr = this.addrList[this.addrList.length-1];
-							}
-						}
-						// 弹出地址层
-						if( showPopup ) this.$refs.addrPopup.open('bottom');
-					}
-				});
-			},
-		}
-	}
+export default {
+  data() {
+    return {
+      height: "",
+      // 奖项列表,
+      prizeList: [],
+      // 中奖记录
+      recordList: [],
+      // 地址列表
+      addrList: [],
+      // 抽奖信息
+      lotteryInfo: {
+        id: 0,
+        name: "",
+        logo: "",
+        need_score: "",
+        start_date: "",
+        end_date: "",
+        start_time: "",
+        end_time: "",
+        rule: "",
+      },
+      // 积分信息
+      scoreInfo: {
+        score: 0,
+        use_score: 0,
+        wait_score: 0,
+      },
+      // 更新积分信息
+      newScore: {
+        score: 0,
+        use_score: 0,
+        wait_score: 0,
+      },
+      recordId: 0,
+    };
+  },
+  onLoad() {
+    // 窗口信息
+    var sysinfo = uni.getWindowInfo();
+    // 获取屏幕可用高度
+    this.height = "height:" + sysinfo.windowHeight + "px;";
+    // 监听地址变动
+    uni.$on("addr_list_change", (data) => {
+      // 地址列表
+      this.addrList = data.list;
+    });
+    // #ifdef MP-WEIXIN
+    //分享按钮
+    uni.showShareMenu({
+      withShareTicket: true,
+      menus: ["shareAppMessage", "shareTimeline"],
+    });
+    // #endif
+  },
+  onShareAppMessage(obj) {
+    // 获取分享信息
+    let shareList = getApp().globalData.shareList;
+    // 获取分享信息
+    let shareObj = {
+      title: "药优惠 得积分 兑豪礼",
+      path: "/pages/score/lottery",
+      imageUrl: "",
+    };
+    // 循环列表
+    for (let i in shareList) {
+      if (shareList[i].pages == "pages/score/lottery") {
+        shareObj.path = shareList[i].path ? shareList[i].path : shareObj.path;
+        shareObj.title = shareList[i].title ? shareList[i].title : shareObj.title;
+        shareObj.imageUrl = shareList[i].image_url ? shareList[i].image_url : shareObj.imageUrl;
+      }
+    }
+    // 返回分享信息
+    return shareObj;
+  },
+  onShow() {
+    // 没有数据的话,或者请求中,不允许刷新
+    if (this.isReqing) return;
+    // 登录提示
+    if (!this.$checkAccess.alterLogin()) return;
+    // 设置请求中
+    this.isReqing = true;
+    // 请求
+    this.$http.request("api/lottery_score/get_detail").then((re) => {
+      // 设置非请求中
+      this.isReqing = false;
+      // 成功结果
+      if (re.code == "success") {
+        this.lotteryInfo = re.data;
+        this.prizeList = re.data.reward_list;
+      }
+    });
+    // 请求列表
+    this.$http.request("/api/custom_score/get_info", {}).then((re) => {
+      // 设置非请求中
+      this.isReqing = false;
+      // 成功结果
+      if (re.code == "success") {
+        this.scoreInfo = re.data;
+        this.newScore = re.data;
+      }
+    });
+  },
+  methods: {
+    onDone(index) {
+      // 奖项
+      let prize = this.prizeList[index];
+      // 如果是实物
+      this.scoreInfo = this.newScore;
+      uni.showModal({
+        title: prize.id == 0 ? "很遗憾" : "恭喜您",
+        content: (prize.id != 0 ? `获得` : "") + prize.name + (prize.reward_type == 5 ? ",请在中奖记录中填写收货地址" : ""),
+        showCancel: false,
+        success: (re) => {
+          if (re.confirm && prize.reward_type == 5) {
+            // 显示中奖列表
+            this.showRecord();
+          }
+        },
+      });
+    },
+    onClick() {
+      // 活动是否开始
+      if (!this.lotteryInfo.id) {
+        uni.showToast({
+          title: "暂无可参与活动",
+          icon: "none",
+        });
+        return;
+      }
+      // 活动是否开始
+      if (this.lotteryInfo.start_time * 1000 > new Date().getTime()) {
+        uni.showToast({
+          title: "活动还没开始哦",
+          icon: "none",
+        });
+        return;
+      }
+      // 活动是否结束
+      if (this.lotteryInfo.end_time * 1000 <= new Date().getTime()) {
+        uni.showToast({
+          title: "活动已结束了哦",
+          icon: "none",
+        });
+        return;
+      }
+      // 积分不足
+      if (this.scoreInfo.score < this.lotteryInfo.need_score) {
+        uni.showToast({
+          title: "积分不足",
+          icon: "none",
+        });
+        return;
+      }
+      // 积分操作
+      this.scoreInfo.score = this.scoreInfo.score - this.lotteryInfo.need_score;
+      // 请求列表
+      this.$http.request("/api/lottery_score/get_reward", { lottery_id: this.lotteryInfo.id }).then((re) => {
+        // 设置非请求中
+        this.isReqing = false;
+        // 成功结果
+        if (re.code == "success") {
+          // 奖品列表更新
+          this.prizeList = re.data.reward_list;
+          this.newScore = re.data.custom_score;
+          // 奖品的索引
+          return this.$refs.dialer.run(re.data.reward_index);
+        } else {
+          uni.showToast({
+            title: re.msg,
+            icon: "none",
+          });
+          // 积分操作
+          this.scoreInfo.score = this.scoreInfo.score + this.lotteryInfo.need_score;
+          return;
+        }
+      });
+    },
+    showRule() {
+      this.$refs.lotteryRule.open("center");
+    },
+    closeRule() {
+      this.$refs.lotteryRule.close();
+    },
+    showRecord() {
+      // 活动是否开始
+      if (this.lotteryInfo.id) {
+        // 请求列表
+        this.$http.request("/api/lottery_score_record/get_list", { lottery_id: this.lotteryInfo.id }).then((re) => {
+          // 设置非请求中
+          this.isReqing = false;
+          // 成功结果
+          if (re.code == "success") {
+            this.recordList = re.data;
+          }
+        });
+      }
+      this.$refs.lotteryRecord.open("bottom");
+    },
+    closeRecord() {
+      this.$refs.lotteryRecord.close();
+    },
+    openAddr(index) {
+      // 选择的下标
+      this.recordIndex = index;
+      // 地址列表
+      this.getAddrList(true);
+    },
+    // 选择地址
+    checkedAddrItem(item) {
+      // 判断数据
+      this.$http.request("api/lottery_score_record/set_addr", { id: this.recordList[this.recordIndex].id, addr_id: item.id }, "post").then((callback) => {
+        // 获取成功
+        if (callback.code == "success") {
+          this.recordList[this.recordIndex].status = 1;
+          this.recordList[this.recordIndex].state = "进行中";
+        }
+        this.$refs.addrPopup.close();
+      });
+    },
+    getAddrList(showPopup = false) {
+      // 判断数据
+      this.$http.request("api/custom_addr/get_list").then((callback) => {
+        // 获取成功
+        if (callback.code == "success") {
+          this.addrList = callback.data;
+          // 如果有的话
+          if (this.addrList.length) {
+            // 获取默认的
+            for (let i in this.addrList) {
+              // 如果是默认的
+              if (this.addrList[i].is_default) this.checkedAddr = this.addrList[i];
+            }
+            // 如果没有默认的话
+            if (!this.checkedAddr.id) {
+              this.checkedAddr = this.addrList[this.addrList.length - 1];
+            }
+          }
+          // 弹出地址层
+          if (showPopup) this.$refs.addrPopup.open("bottom");
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	.lottery_box{
-		display: block;
-		width: 750rpx;
-		height: 1100rpx;
-		margin: 0 auto;
-		position: relative;
-		background: linear-gradient(to bottom, #FC335F 0%, #FB7224 80%, #FFFFFF 100%);
-		.lottery_time{
-			top: 0rpx;
-			left: 35rpx;
-			z-index: 1;
-			width: 700rpx;
-			color: #FFFFFF;
-			display: block;
-			height: 40rpx;
-			font-size: 24rpx;
-			line-height: 40rpx;
-			text-align: center;
-			position: absolute;
-			border-radius: 10rpx;
-			background-color: rgba(0, 0, 0,0.15);
-		}
-		.lottery_info{
-			width: 750rpx;
-			overflow: hidden;
-			margin: 0rpx auto;
-			position: relative;
-			margin-bottom: 40rpx;
-			.lottery_logo{
-				float: left;
-				width: 750rpx;
-				display: block;
-			}
-			.lottery_rule_btn{
-				top: 50%;
-				right: 0rpx;
-				width: 120rpx;
-				height: 60rpx;
-				color: #FFFFFF;
-				overflow: hidden;
-				font-size: 24rpx;
-				text-align: center;
-				line-height: 60rpx;
-				position: absolute;
-				padding: 0rpx 0rpx;
-				border-top-left-radius: 30rpx;
-				border-bottom-left-radius: 30rpx;
-				border-top-right-radius: 0rpx;
-				border-bottom-right-radius: 0rpx;
-				background-color: rgba(0, 0, 0,0.3);
-			}
-			.lottery_rule_btn::after{
-				border: 0rpx solid transparent;
-			}
-		}
-		.record_box{
-			display: block;
-			height: 120rpx;
-			overflow: hidden;
-			position: relative;
-			margin-top: 40rpx;
-			.score_info{
-				display: block;
-				overflow: auto;
-				.custom_score{
-					height: 60rpx;
-					font-size: 28rpx;
-					text-align: center;
-					line-height: 60rpx;
-				}
-				.need_score{
-					height: 60rpx;
-					font-size: 32rpx;
-					text-align: center;
-					line-height: 60rpx;
-				}
-			}
-			.lottery_record{
-				top: 0rpx;
-				right: 0rpx;
-				width: 120rpx;
-				height: 120rpx;
-				overflow: hidden;
-				text-align: center;
-				position: absolute;
-				padding: 0rpx 0rpx;
-				background-color: transparent;
-				.lottery_record_img{
-					width: 60rpx;
-					height: 60rpx;
-					display: block;
-					margin: 0rpx auto;
-				}
-				.lottery_record_text{
-					color: #FFFFFF;
-					display: block;
-					height: 40rpx;
-					width: 120rpx;
-					font-size: 24rpx;
-					line-height: 40rpx;
-				}
-			}
-			.lottery_record::after{
-				border: none;
-			}
-		}
-	}
-	.lottery_rule_box{
-		width: 500rpx;
-		display: block;
-		overflow: hidden;
-		background: #FFFFFF;
-		font-size: 26rpx;
-		margin: 0rpx auto;
-		line-height: 50rpx;
-		border-radius: 10rpx;
-		padding: 0rpx 25rpx;
-		padding-bottom: 20rpx;
-		background-color: #FC335F;
-		.lottery_rule_title{
-			color: #FFFFFF;
-			height: 60rpx;
-			font-size: 32rpx;
-			line-height: 60rpx;
-			text-align: center;
-			margin-bottom: 10rpx;
-			.close_btn{
-				float: right;
-				width: 40rpx;
-				height: 40rpx;
-				font-size: 24rpx;
-				margin-top: 9rpx;
-				line-height: 40rpx;
-				border-radius: 50%;
-				border: 1rpx solid #FFFFFF;
-			}
-		}
-		.lottery_rule_info{
-			display: block;
-			height: 500rpx;
-			font-size: 24rpx;
-			line-height: 40rpx;
-			border-radius: 10rpx;
-			padding: 20rpx 20rpx;
-			box-sizing: border-box;
-			background-color: #FFFFFF;
-			.rich_text{
-				white-space: break-spaces;
-			}
-		}
-	}
-	.lottery_record_box{
-		display: block;
-		color: #DEB887;
-		height: 700rpx;
-		padding: 10rpx 25rpx;
-		background-color: #FAEBD7;
-		.lottery_record_title{
-			color: #000000;
-			height: 80rpx;
-			font-weight: bold;
-			font-size: 32rpx;
-			line-height: 80rpx;
-			text-align: center;
-			margin-bottom: 20rpx;
-			.close_btn{
-				float: right;
-				width: 40rpx;
-				height: 40rpx;
-				color: #DEB887;
-				font-size: 24rpx;
-				margin-top: 9rpx;
-				line-height: 40rpx;
-				border-radius: 50%;
-				border: 2rpx solid #DEB887;
-			}
-		}
-		.lottery_record_none{
-			display: block;
-			height: 200rpx;
-			color: #DEB887;
-			font-size: 26rpx;
-			text-align: center;
-			line-height: 200rpx;
-		}
-		.lottery_record_list{
-			display: block;
-			height: 500rpx;
-			.lottery_record_item{
-				height: 80rpx;
-				display: block;
-				font-size: 26rpx;
-				overflow: hidden;
-				line-height: 80rpx;
-				.reward_time{
-					float: left;
-					width: 300rpx;
-				}
-				.reward_name{
-					float: left;
-					width: 200rpx;
-				}
-				.reward_state{
-					float: right;
-				}
-			}
-		}
-	}
-	.popup{
-		overflow: hidden;
-		.popup_title{
-			display: block;
-			overflow: hidden;
-			margin: 0rpx auto;
-			font-size: 36rpx;
-			height: 120rpx;
-			line-height: 120rpx;
-			padding: 0rpx 20rpx;
-			border-bottom: 10rpx solid #F8F8F8;
-			.to_addr_page{
-				float: right;
-				color: #F59A23;
-				display: block;
-				height: 120rpx;
-				line-height: 120rpx;
-				font-size: 26rpx;
-				padding: 0rpx 10rpx;
-			}
-		}
-		.addr_list{
-			width: 730rpx;
-			display: block;
-			overflow: hidden;
-			margin: 0rpx auto;
-			min-height: 500rpx;
-			.addr_item{
-				display: block;
-				font-size: 24rpx;
-				overflow: hidden;
-				line-height: 40rpx;
-				padding: 15rpx 10rpx;
-				border-radius: 15rpx;
-				border-bottom: 2rpx solid #dddddd;
-				.radio_label{
-					width: 40rpx;
-					float: left;
-					height: 50rpx;
-					padding-top: 30rpx;
-					margin-right: 20rpx;
-					.radio_icon{
-						float: left;
-						width: 40rpx;
-						height: 40rpx;
-					}
-				}
-				.contact_user{
-					float: left;
-					width: 640rpx;
-					display: block;
-					height: 50rpx;
-					font-size: 24rpx;
-					line-height: 50rpx;
-					.contact_name{
-						font-size: 26rpx;
-						font-weight: bold;
-						margin-right: 16rpx;
-					}
-					.contact_default{
-						color: #F59A23;
-						font-size: 20rpx;
-						margin-left: 16rpx;
-						border: 1rpx solid #F59A23;
-					}
-					.contact_shop{
-						float: right;
-						font-size: 26rpx;
-						margin-right: 16rpx;
-					}
-				}
-				.contact_addr{
-					float: left;
-					width: 640rpx;
-					display: block;
-					font-size: 24rpx;
-					line-height: 30rpx;
-					padding: 10rpx 5rpx;
-				}
-			}
-		}
-		.create_box{
-			height: 140rpx;
-			display: block;
-			.create_addr{
-				width: 700rpx;
-				height: 80rpx;
-				display: block;
-				color: #FFFFFF;
-				font-size: 30rpx;
-				overflow: hidden;
-				line-height: 80rpx;
-				padding: 0rpx 0rpx;
-				text-align: center;
-				margin: 0rpx auto;
-				margin-top: 20rpx;
-				border-radius: 40rpx;
-				background-color: #E03519;
-			}
-		}
-	}
+.lottery_box {
+  display: block;
+  width: 750rpx;
+  height: 1100rpx;
+  margin: 0 auto;
+  position: relative;
+  background: linear-gradient(to bottom, #fc335f 0%, #fb7224 80%, #ffffff 100%);
+  .lottery_time {
+    top: 0rpx;
+    left: 35rpx;
+    z-index: 1;
+    width: 700rpx;
+    color: #ffffff;
+    display: block;
+    height: 40rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    text-align: center;
+    position: absolute;
+    border-radius: 10rpx;
+    background-color: rgba(0, 0, 0, 0.15);
+  }
+  .lottery_info {
+    width: 750rpx;
+    overflow: hidden;
+    margin: 0rpx auto;
+    position: relative;
+    margin-bottom: 40rpx;
+    .lottery_logo {
+      float: left;
+      width: 750rpx;
+      display: block;
+    }
+    .lottery_rule_btn {
+      top: 50%;
+      right: 0rpx;
+      width: 120rpx;
+      height: 60rpx;
+      color: #ffffff;
+      overflow: hidden;
+      font-size: 24rpx;
+      text-align: center;
+      line-height: 60rpx;
+      position: absolute;
+      padding: 0rpx 0rpx;
+      border-top-left-radius: 30rpx;
+      border-bottom-left-radius: 30rpx;
+      border-top-right-radius: 0rpx;
+      border-bottom-right-radius: 0rpx;
+      background-color: rgba(0, 0, 0, 0.3);
+    }
+    .lottery_rule_btn::after {
+      border: 0rpx solid transparent;
+    }
+  }
+  .record_box {
+    display: block;
+    height: 120rpx;
+    overflow: hidden;
+    position: relative;
+    margin-top: 40rpx;
+    .score_info {
+      display: block;
+      overflow: auto;
+      .custom_score {
+        height: 60rpx;
+        font-size: 28rpx;
+        text-align: center;
+        line-height: 60rpx;
+      }
+      .need_score {
+        height: 60rpx;
+        font-size: 32rpx;
+        text-align: center;
+        line-height: 60rpx;
+      }
+    }
+    .lottery_record {
+      top: 0rpx;
+      right: 0rpx;
+      width: 120rpx;
+      height: 120rpx;
+      overflow: hidden;
+      text-align: center;
+      position: absolute;
+      padding: 0rpx 0rpx;
+      background-color: transparent;
+      .lottery_record_img {
+        width: 60rpx;
+        height: 60rpx;
+        display: block;
+        margin: 0rpx auto;
+      }
+      .lottery_record_text {
+        color: #ffffff;
+        display: block;
+        height: 40rpx;
+        width: 120rpx;
+        font-size: 24rpx;
+        line-height: 40rpx;
+      }
+    }
+    .lottery_record::after {
+      border: none;
+    }
+  }
+}
+.lottery_rule_box {
+  width: 500rpx;
+  display: block;
+  overflow: hidden;
+  background: #ffffff;
+  font-size: 26rpx;
+  margin: 0rpx auto;
+  line-height: 50rpx;
+  border-radius: 10rpx;
+  padding: 0rpx 25rpx;
+  padding-bottom: 20rpx;
+  background-color: #fc335f;
+  .lottery_rule_title {
+    color: #ffffff;
+    height: 60rpx;
+    font-size: 32rpx;
+    line-height: 60rpx;
+    text-align: center;
+    margin-bottom: 10rpx;
+    .close_btn {
+      float: right;
+      width: 40rpx;
+      height: 40rpx;
+      font-size: 24rpx;
+      margin-top: 9rpx;
+      line-height: 40rpx;
+      border-radius: 50%;
+      border: 1rpx solid #ffffff;
+    }
+  }
+  .lottery_rule_info {
+    display: block;
+    height: 500rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    border-radius: 10rpx;
+    padding: 20rpx 20rpx;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    .rich_text {
+      white-space: break-spaces;
+    }
+  }
+}
+.lottery_record_box {
+  display: block;
+  color: #deb887;
+  height: 700rpx;
+  padding: 10rpx 25rpx;
+  background-color: #faebd7;
+  .lottery_record_title {
+    color: #000000;
+    height: 80rpx;
+    font-weight: bold;
+    font-size: 32rpx;
+    line-height: 80rpx;
+    text-align: center;
+    margin-bottom: 20rpx;
+    .close_btn {
+      float: right;
+      width: 40rpx;
+      height: 40rpx;
+      color: #deb887;
+      font-size: 24rpx;
+      margin-top: 9rpx;
+      line-height: 40rpx;
+      border-radius: 50%;
+      border: 2rpx solid #deb887;
+    }
+  }
+  .lottery_record_none {
+    display: block;
+    height: 200rpx;
+    color: #deb887;
+    font-size: 26rpx;
+    text-align: center;
+    line-height: 200rpx;
+  }
+  .lottery_record_list {
+    display: block;
+    height: 500rpx;
+    .lottery_record_item {
+      height: 80rpx;
+      display: block;
+      font-size: 26rpx;
+      overflow: hidden;
+      line-height: 80rpx;
+      .reward_time {
+        float: left;
+        width: 300rpx;
+      }
+      .reward_name {
+        float: left;
+        width: 200rpx;
+      }
+      .reward_state {
+        float: right;
+      }
+    }
+  }
+}
+.popup {
+  overflow: hidden;
+  .popup_title {
+    display: block;
+    overflow: hidden;
+    margin: 0rpx auto;
+    font-size: 36rpx;
+    height: 120rpx;
+    line-height: 120rpx;
+    padding: 0rpx 20rpx;
+    border-bottom: 10rpx solid #f8f8f8;
+    .to_addr_page {
+      float: right;
+      color: #f59a23;
+      display: block;
+      height: 120rpx;
+      line-height: 120rpx;
+      font-size: 26rpx;
+      padding: 0rpx 10rpx;
+    }
+  }
+  .addr_list {
+    width: 730rpx;
+    display: block;
+    overflow: hidden;
+    margin: 0rpx auto;
+    min-height: 500rpx;
+    .addr_item {
+      display: block;
+      font-size: 24rpx;
+      overflow: hidden;
+      line-height: 40rpx;
+      padding: 15rpx 10rpx;
+      border-radius: 15rpx;
+      border-bottom: 2rpx solid #dddddd;
+      .radio_label {
+        width: 40rpx;
+        float: left;
+        height: 50rpx;
+        padding-top: 30rpx;
+        margin-right: 20rpx;
+        .radio_icon {
+          float: left;
+          width: 40rpx;
+          height: 40rpx;
+        }
+      }
+      .contact_user {
+        float: left;
+        width: 640rpx;
+        display: block;
+        height: 50rpx;
+        font-size: 24rpx;
+        line-height: 50rpx;
+        .contact_name {
+          font-size: 26rpx;
+          font-weight: bold;
+          margin-right: 16rpx;
+        }
+        .contact_default {
+          color: #f59a23;
+          font-size: 20rpx;
+          margin-left: 16rpx;
+          border: 1rpx solid #f59a23;
+        }
+        .contact_shop {
+          float: right;
+          font-size: 26rpx;
+          margin-right: 16rpx;
+        }
+      }
+      .contact_addr {
+        float: left;
+        width: 640rpx;
+        display: block;
+        font-size: 24rpx;
+        line-height: 30rpx;
+        padding: 10rpx 5rpx;
+      }
+    }
+  }
+  .create_box {
+    height: 140rpx;
+    display: block;
+    .create_addr {
+      width: 700rpx;
+      height: 80rpx;
+      display: block;
+      color: #ffffff;
+      font-size: 30rpx;
+      overflow: hidden;
+      line-height: 80rpx;
+      padding: 0rpx 0rpx;
+      text-align: center;
+      margin: 0rpx auto;
+      margin-top: 20rpx;
+      border-radius: 40rpx;
+      background-color: #e03519;
+    }
+  }
+}
 </style>

+ 6 - 3
pages/score/product.vue

@@ -49,11 +49,11 @@
                 </view>
                 <view class="product_quantity_box">
                   <button class="product_quantity_sub" @click="changeQuantity(-1)" data-eventsync="true">
-                    <image class="sub_icon" src="../../static/icon/sub_icon.png" mode=""></image>
+                    <image class="sub_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/sub_icon.png" mode=""></image>
                   </button>
                   <input type="number" class="product_quantity" placeholder="数量" v-model="quantity" @blur="changeQuantity(0)" />
                   <button class="product_quantity_add" @click="changeQuantity(+1)" data-eventsync="true">
-                    <image class="add_icon" src="../../static/icon/add_icon.png" mode=""></image>
+                    <image class="add_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/add_icon.png" mode=""></image>
                   </button>
                 </view>
               </view>
@@ -77,7 +77,10 @@
         <view class="addr_list">
           <view class="addr_item" v-for="(item, index) in addrList" :key="index" @click="checkedAddrItem(item)">
             <view class="radio_label">
-              <image class="radio_icon" :src="item.id == checkedAddr.id ? '../../static/icon/radioed.png' : '../../static/icon/radio.png'"></image>
+              <image
+                class="radio_icon"
+                :src="item.id == checkedAddr.id ? 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radioed.png' : 'https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/radio.png'"
+              ></image>
             </view>
             <view class="contact_user">
               <text class="contact_name">{{ item.contact_name }}</text>

+ 139 - 142
pages/user/follow.vue

@@ -1,150 +1,147 @@
 <template>
-	<view>
-		<uni-popup ref="addFollow" type="center" class="center_popup" :mask-click="false">
-			<view class="add_follow">
-				<view class="close_area">
-					
-				</view>
-				<view class="qr_code_area" @click="followLinkurl">
-					<image v-if="followQrcode" :src="followQrcode" class="qr_code" mode="" show-menu-by-longpress></image>
-				</view>
-				<view class="info_alter">
-					<text v-if="follow_linkurl">点击二维码添加客服</text>
-					<text v-if="!follow_linkurl">长按二维码添加客服</text>
-				</view>
-				<view class="rule_info">
-					<view class="">规则:</view>
-					<view class="">1、预约报单需要添加客服人员</view>
-					<view class="">2、添加完客服人员后填写小程序当前登录手机号以绑定账号</view>
-					<view class="">3、开始预约报单</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
+  <view>
+    <uni-popup ref="addFollow" type="center" class="center_popup" :mask-click="false">
+      <view class="add_follow">
+        <view class="close_area"> </view>
+        <view class="qr_code_area" @click="followLinkurl">
+          <image v-if="followQrcode" :src="followQrcode" class="qr_code" mode="" show-menu-by-longpress></image>
+        </view>
+        <view class="info_alter">
+          <text v-if="follow_linkurl">点击二维码添加客服</text>
+          <text v-if="!follow_linkurl">长按二维码添加客服</text>
+        </view>
+        <view class="rule_info">
+          <view class="">规则:</view>
+          <view class="">1、预约报单需要添加客服人员</view>
+          <view class="">2、添加完客服人员后填写小程序当前登录手机号以绑定账号</view>
+          <view class="">3、开始预约报单</view>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				followQrcode:"",
-				follow_linkurl:"",
-			}
-		},
-		onShow() {
-			// 登录提示
-			if( !this.$checkAccess.alterLogin() ) return ;
-			// 判断数据
-			this.$http.request('api/custom/get_info').then((callback)=>{
-				if( callback.code == 'success' ){
-					if( !callback.data.userpic ) callback.data.userpic = "../../static/icon/doctor.png";
-					// 存储登录标识
-					uni.setStorageSync('userInfo',callback.data);
-				}
-			});
-			this.openAddFollow();
-		},
-		methods: {
-			// 客服显示
-			openAddFollow(){
-				// 返回结果
-				this.followQrcode 		= this.$checkAccess.getFollowQrcode();
-				// 返回结果
-				this.follow_linkurl 	= this.$checkAccess.getFollowLinkUrl();
-				// 有图才展示
-				if( this.followQrcode )	this.$refs.addFollow.open('center');
-			},
-			closeAddFollow(){
-				this.$refs.addFollow.close();
-			},
-			// 去往webview
-			followLinkurl(){
-				// 获取登录标识
-				let userInfo   					= uni.getStorageSync('userInfo');
-				// 如果不存在的话
-				if( !userInfo )					return '';
-				// 未添加好友
-				if( !userInfo.follow_linkurl )	return '';
-				// 获取Url
-				let  url			= userInfo.follow_linkurl;
-				// 没有路径,不跳转
-				if( !url )			return;
-				// 判断是不是小程序链接
-				if( url.includes('http') ){
-					// 转码
-					let link_url = encodeURIComponent(url);
-					// 跳转到webview
-					uni.redirectTo({
-						url:`/pages/webview/index?link_url=${link_url}`
-					})
-				}else{
-					// 跳转到webview
-					uni.navigateTo({url:url});
-				}
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      followQrcode: "",
+      follow_linkurl: "",
+    };
+  },
+  onShow() {
+    // 登录提示
+    if (!this.$checkAccess.alterLogin()) return;
+    // 判断数据
+    this.$http.request("api/custom/get_info").then((callback) => {
+      if (callback.code == "success") {
+        if (!callback.data.userpic) callback.data.userpic = "https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/doctor.png";
+        // 存储登录标识
+        uni.setStorageSync("userInfo", callback.data);
+      }
+    });
+    this.openAddFollow();
+  },
+  methods: {
+    // 客服显示
+    openAddFollow() {
+      // 返回结果
+      this.followQrcode = this.$checkAccess.getFollowQrcode();
+      // 返回结果
+      this.follow_linkurl = this.$checkAccess.getFollowLinkUrl();
+      // 有图才展示
+      if (this.followQrcode) this.$refs.addFollow.open("center");
+    },
+    closeAddFollow() {
+      this.$refs.addFollow.close();
+    },
+    // 去往webview
+    followLinkurl() {
+      // 获取登录标识
+      let userInfo = uni.getStorageSync("userInfo");
+      // 如果不存在的话
+      if (!userInfo) return "";
+      // 未添加好友
+      if (!userInfo.follow_linkurl) return "";
+      // 获取Url
+      let url = userInfo.follow_linkurl;
+      // 没有路径,不跳转
+      if (!url) return;
+      // 判断是不是小程序链接
+      if (url.includes("http")) {
+        // 转码
+        let link_url = encodeURIComponent(url);
+        // 跳转到webview
+        uni.redirectTo({
+          url: `/pages/webview/index?link_url=${link_url}`,
+        });
+      } else {
+        // 跳转到webview
+        uni.navigateTo({ url: url });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	// 添加客服
-	.center_popup{
-		.add_follow{
-			display: block;
-			color: #FFFFFF;
-			width: 700rpx;
-			height: 900rpx;
-			margin: 0 auto;
-			font-size: 26rpx;
-			border-radius: 40rpx;
-			background: linear-gradient(to bottom, #ff0091 0%, #2c82ff 100%);
-			.close_area{
-				height: 30rpx;
-				display: block;
-				line-height: 30rpx;
-			}
-			.info_alter{
-				display: block;
-				height: 100rpx;
-				font-size: 42rpx;
-				font-weight: bold;
-				text-align: center;
-				line-height: 100rpx;
-			}
-			.qr_code_area{
-				display: block;
-				width: 300rpx;
-				height: 300rpx;
-				margin: 60rpx auto;
-				.qr_code{
-					float: left;
-					width: 300rpx;
-					height: 300rpx;
-				}
-			}
-			.save_btn{
-				color: #333333;
-				display: block;
-				width: 260rpx;
-				height: 80rpx;
-				font-size: 26rpx;
-				text-align: center;
-				line-height: 80rpx;
-				padding: 0rpx 0rpx;
-				margin: 40rpx auto;
-				border-radius: 40rpx;
-				background-color: #FFFFFF;
-				border: 0rpx solid transparent;
-			}
-			.rule_info{
-				width: 600rpx;
-				display: block;
-				font-size: 26rpx;
-				margin: 20rpx auto;
-				overflow: hidden;
-				line-height: 60rpx;
-			}
-		}
-	}
-	
+// 添加客服
+.center_popup {
+  .add_follow {
+    display: block;
+    color: #ffffff;
+    width: 700rpx;
+    height: 900rpx;
+    margin: 0 auto;
+    font-size: 26rpx;
+    border-radius: 40rpx;
+    background: linear-gradient(to bottom, #ff0091 0%, #2c82ff 100%);
+    .close_area {
+      height: 30rpx;
+      display: block;
+      line-height: 30rpx;
+    }
+    .info_alter {
+      display: block;
+      height: 100rpx;
+      font-size: 42rpx;
+      font-weight: bold;
+      text-align: center;
+      line-height: 100rpx;
+    }
+    .qr_code_area {
+      display: block;
+      width: 300rpx;
+      height: 300rpx;
+      margin: 60rpx auto;
+      .qr_code {
+        float: left;
+        width: 300rpx;
+        height: 300rpx;
+      }
+    }
+    .save_btn {
+      color: #333333;
+      display: block;
+      width: 260rpx;
+      height: 80rpx;
+      font-size: 26rpx;
+      text-align: center;
+      line-height: 80rpx;
+      padding: 0rpx 0rpx;
+      margin: 40rpx auto;
+      border-radius: 40rpx;
+      background-color: #ffffff;
+      border: 0rpx solid transparent;
+    }
+    .rule_info {
+      width: 600rpx;
+      display: block;
+      font-size: 26rpx;
+      margin: 20rpx auto;
+      overflow: hidden;
+      line-height: 60rpx;
+    }
+  }
+}
 </style>

+ 8 - 8
pages/user/index.vue

@@ -13,7 +13,7 @@
       <view class="box_right">
         <navigator url="/pages/user/info" class="company_text" v-if="!userInfo.city_id">请选择城市</navigator>
         <navigator url="/pages/user/settings" class="setting_page" v-if="userInfo.city_id">
-          <image class="setting_icon" src="../../static/icon/setting.png"></image>
+          <image class="setting_icon" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/setting.png"></image>
         </navigator>
       </view>
     </view>
@@ -32,26 +32,26 @@
     </view>
     <view class="navigator_list">
       <navigator class="navigator_item" url="/pages/orders/index">
-        <image class="navigator_image" src="../../static/icon/orders.png" mode=""></image>
+        <image class="navigator_image" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/orders.png" mode=""></image>
         <view class="navigator_title">预约</view>
       </navigator>
       <navigator class="navigator_item" url="/pages/coupon/index">
-        <image class="navigator_image" src="../../static/icon/coupon.png" mode=""></image>
+        <image class="navigator_image" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/coupon.png" mode=""></image>
         <view class="navigator_title">优惠券</view>
       </navigator>
       <navigator class="navigator_item" url="/pages/score/orders">
-        <image class="navigator_image" src="../../static/icon/score_gift.png" mode=""></image>
+        <image class="navigator_image" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/score_gift.png" mode=""></image>
         <view class="navigator_title">积分订单</view>
       </navigator>
       <navigator class="navigator_item" url="/pages/recruitment/index">
-        <image class="navigator_image" src="../../static/icon/score_gift.png" mode=""></image>
+        <image class="navigator_image" src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/score_gift.png" mode=""></image>
         <view class="navigator_title">拉新活动</view>
       </navigator>
     </view>
     <view class="alter_info">本程序暂不提供在线交易以及支付功能,您所提交的预约,我们将验证您的购药资质并交由有售卖药品资质的商业公司与您联系确认并提供线下后续服务。</view>
     <view class="packet_content">
       <view class="close_btn" @click="closeRule"> X </view>
-      <image src="../../static/icon/red_packet.gif" class="red_packet" @click="_getredpacket" />
+      <image src="https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/red_packet.gif" class="red_packet" @click="_getredpacket" />
     </view>
   </view>
 </template>
@@ -62,7 +62,7 @@ export default {
     return {
       userInfo: {
         username: "请登录",
-        userpic: "../../static/icon/doctor.png",
+        userpic: "https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/doctor.png",
         phone: "kailin",
         status: 0,
         city_id: 0,
@@ -119,7 +119,7 @@ export default {
     // 判断数据
     this.$http.request("api/custom/get_info").then((callback) => {
       if (callback.code == "success") {
-        if (!callback.data.userpic) callback.data.userpic = "../../static/icon/doctor.png";
+        if (!callback.data.userpic) callback.data.userpic = "https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/doctor.png";
         // 赋值
         this.userInfo = callback.data;
         // 存储登录标识

+ 1 - 1
pages/user/settings.vue

@@ -45,7 +45,7 @@ export default {
   onLoad() {
     let userInfo = uni.getStorageSync("userInfo");
     this.userInfo = userInfo;
-    if (!this.userInfo.userpic) this.userInfo.userpic = "../../static/icon/doctor.png";
+    if (!this.userInfo.userpic) this.userInfo.userpic = "https://kailin-mp.oss-cn-shenzhen.aliyuncs.com/static/icon/doctor.png";
   },
   onShow() {},
   methods: {

BIN
static/icon/add_icon.png


BIN
static/icon/back.png


BIN
static/icon/checkbox.png


BIN
static/icon/checkbox_disabled.png


BIN
static/icon/checked.png


BIN
static/icon/coupon.png


BIN
static/icon/doctor.png


BIN
static/icon/orders.png


BIN
static/icon/packet_list_backerground.png


BIN
static/icon/radio.png


BIN
static/icon/radioed.png


BIN
static/icon/red_packet.gif


BIN
static/icon/red_packet_background.jpg


BIN
static/icon/red_packet_bottom.png


BIN
static/icon/score.png


BIN
static/icon/score_gift.png


BIN
static/icon/setting.png


BIN
static/icon/sub_icon.png


BIN
static/logo2.jpg